diff --git a/elements/components/desktop-shell.yml b/elements/components/desktop-shell.yml
index a1e885eb..c4b6e889 100644
--- a/elements/components/desktop-shell.yml
+++ b/elements/components/desktop-shell.yml
@@ -17,6 +17,7 @@ depends:
   
   - components/i3blocks.yml
   - components/rofi.yml
+  - components/bemenu.yml
   - components/foot.yml
   - components/brightnessctl.yml
   - components/pipewire.yml
@@ -70,20 +71,11 @@ script: |-
     -b "Reboot" "systemctl reboot"
 
   output * bg %{datadir}/backgrounds/default_blur.jpg fill
-
-  include /etc/sway/config.d/*
   EOF
 
   install -v -D -m 0644 /files/backgrounds/default.jpg %{install-root}%{datadir}/backgrounds/default.jpg
   install -v -D -m 0644 /files/backgrounds/default_blur.jpg %{install-root}%{datadir}/backgrounds/default_blur.jpg
 
-  install -v -D -m 0644 /dev/stdin %{install-root}%{sysconfdir}/gtk-3.0/settings.ini << "EOF"
-  [Settings]
-  gtk-icon-theme-name = Qogir
-  gtk-theme-name = Qogir-Light
-  gtk-font-name = %{font_theme}
-  EOF
-
   install -v -D -m 0644 /dev/stdin %{install-root}%{sysconfdir}/swaynag/config << "EOF"
   font=%{font_theme}
   dismiss-button=x
@@ -106,405 +98,11 @@ script: |-
   button-background=#EFEF8D
   EOF
 
-  install -v -D -m 0644 /dev/stdin %{install-root}%{sysconfdir}/sway/config << "EOF"
-  set $mod Mod4
-
-  set $left h
-  set $down j
-  set $up k
-  set $right l
-
-  set $term foot
-
-  set $background %{background_color}
-  set $background_secondary %{background_secondary_color}
-  set $foreground %{foreground_color}
-  set $foreground_secondary %{foreground_secondary_color}
-  set $border %{border_color}
-  set $highlight %{highlight_color}
-  set $font "IBM Plex Sans 12"
-
-  set $menu 'rofi -modi run,drun,window -show drun'
-
-  set $background_image /usr/share/backgrounds/default.jpg
-  set $background_blur_image /usr/share/backgrounds/default_blur.jpg
-
-  set $lock swaylock -f
-
-  titlebar_border_thickness 2
-  titlebar_padding 5
-  title_align center
-
-  font pango: IBM Plex Sans Regular 11
-  # class                 border                 background             foreground               indicator  child_border
-  client.focused          $background            $background            $foreground             $highlight  $border
-  client.focused_inactive $background_secondary  $background_secondary  $foreground_secondary   $highlight  $background_secondary
-  client.unfocused        $background_secondary  $background_secondary  $foreground_secondary   $highlight  $background_secondary
-  client.urgent           $background_secondary  $background_secondary  $foreground_secondary   $highlight  $background_secondary
-  client.placeholder      $background_secondary  $background_secondary  $foreground_secondary   $highlight  $background_secondary
-
-  blur on
-  blur_xray off
-  blur_passes 2
-  blur_radius 5
-
-  shadows on
-  shadows_on_csd on
-  shadow_blur_radius 20
-  shadow_color #0000007F
-
-  # inactive window fade amount. 0.0 = no dimming, 1.0 = fully dimmed
-  default_dim_inactive 0.0
-  dim_inactive_colors.unfocused #000000AA
-  dim_inactive_colors.urgent #900000AA
-
-  # Move minimized windows into Scratchpad (enable|disable)
-  scratchpad_minimize enable
-
-  default_border pixel 3
-  output * bg $background_image fill
-  
-  bindswitch --reload --locked lid:on output * disable
-  bindswitch --reload --locked lid:off output * enable
-
-  exec $lock
-
-  set $WOBSOCK $XDG_RUNTIME_DIR/wob.sock
-
-  seat seat0 xcursor_theme Qogir 24
-
-  exec swayidle -w \
-          timeout 300 '$lock' \
-          timeout 600 'swaymsg "output * dpms off"' \
-               resume 'swaymsg "output * dpms on"' \
-          before-sleep '$lock'
-
-  bindswitch tablet:on exec %{bindir}/tablet-mode on
-  bindswitch tablet:off exec %{bindir}/tablet-mode off
-
-  # Start a terminal
-  bindsym $mod+Return exec $term
-
-  # Kill focused window
-  bindsym $mod+Shift+q kill
-
-  # Start your launcher
-  bindsym $mod+d exec $menu
-
-  # Drag floating windows by holding down $mod and left mouse button.
-  # Resize them with right mouse button + $mod.
-  # Despite the name, also works for non-floating windows.
-  # Change normal to inverse to use left mouse button for resizing and right
-  # mouse button for dragging.
-  floating_modifier $mod normal
-
-  # Reload the configuration file
-  bindsym $mod+Shift+c reload
-
-  # Exit sway (logs you out of your Wayland session)
-  bindsym $mod+Shift+e exec swaynag \
-           -m 'System Menu' \
-           -b 'Logout' 'swaymsg exit' \
-           -b 'Sleep' 'systemctl suspend' \
-           -b 'Shutdown' 'systemctl poweroff' \
-           -b 'Restart' 'systemctl reboot'
-
-  # Move your focus around
-  bindsym $mod+$left focus left
-  bindsym $mod+$down focus down
-  bindsym $mod+$up focus up
-  bindsym $mod+$right focus right
-  # Or use $mod+[up|down|left|right]
-  bindsym $mod+Left focus left
-  bindsym $mod+Down focus down
-  bindsym $mod+Up focus up
-  bindsym $mod+Right focus right
-
-  # Move the focused window with the same, but add Shift
-  bindsym $mod+Shift+$left move left
-  bindsym $mod+Shift+$down move down
-  bindsym $mod+Shift+$up move up
-  bindsym $mod+Shift+$right move right
-  # Ditto, with arrow keys
-  bindsym $mod+Shift+Left move left
-  bindsym $mod+Shift+Down move down
-  bindsym $mod+Shift+Up move up
-  bindsym $mod+Shift+Right move right
-  
-  #
-  # Workspaces:
-  #
-  # Switch to workspace
-  bindsym $mod+1 workspace number 1
-  bindsym $mod+2 workspace number 2
-  bindsym $mod+3 workspace number 3
-  bindsym $mod+4 workspace number 4
-  bindsym $mod+5 workspace number 5
-  bindsym $mod+6 workspace number 6
-  bindsym $mod+7 workspace number 7
-  bindsym $mod+8 workspace number 8
-  bindsym $mod+9 workspace number 9
-  bindsym $mod+0 workspace number 10
-  # Move focused container to workspace
-  bindsym $mod+Shift+1 move container to workspace number 1
-  bindsym $mod+Shift+2 move container to workspace number 2
-  bindsym $mod+Shift+3 move container to workspace number 3
-  bindsym $mod+Shift+4 move container to workspace number 4
-  bindsym $mod+Shift+5 move container to workspace number 5
-  bindsym $mod+Shift+6 move container to workspace number 6
-  bindsym $mod+Shift+7 move container to workspace number 7
-  bindsym $mod+Shift+8 move container to workspace number 8
-  bindsym $mod+Shift+9 move container to workspace number 9
-  bindsym $mod+Shift+0 move container to workspace number 10
-  # Note: workspaces can have any name you want, not just numbers.
-  # We just use 1-10 as the default.
-  
-  #
-  # Layout stuff:
-  #
-  # You can "split" the current object of your focus with
-  # $mod+b or $mod+v, for horizontal and vertical splits
-  # respectively.
-  bindsym $mod+b splith
-  bindsym $mod+v splitv
-
-  # Switch the current container between different layout styles
-  bindsym $mod+s layout stacking
-  bindsym $mod+w layout tabbed
-  bindsym $mod+e layout toggle split
-
-  # Make the current focus fullscreen
-  bindsym $mod+f fullscreen
-
-  # Toggle the current focus between tiling and floating mode
-  bindsym $mod+Shift+space floating toggle
-
-  # Swap focus between the tiling area and the floating area
-  bindsym $mod+space focus mode_toggle
+  for dir in sway swaylock rofi ; do
+    cp -rf /files/$dir %{install-root}%{sysconfdir}/
+  done
 
-  bindsym $mod+a exec ApplicationLauncher
-  bindgesture swipe:3:up exec ApplicationLauncher
-
-  bindgesture swipe:3:right workspace prev
-  bindgesture swipe:3:left workspace next
   
-  # Audio
-  bindsym XF86AudioMute pactl set-sink-mute `pactl list sinks short | grep -E 'RUNNING|IDLE' | awk '{print $1}'` toggle
-  bindsym XF86AudioRaiseVolume exec pamixer -ui 5 && pamixer --get-volume > $WOBSOCK
-  bindsym XF86AudioLowerVolume exec pamixer -ud 5 && pamixer --get-volume > $WOBSOCK
-
-  # Media
-  bindsym XF86AudioPrev exec playerctl previous
-  bindsym XF86AudioPlay exec playerctl play-pause
-  bindsym XF86AudioNext exec playerctl next
-
-  # Backlight
-  bindsym XF86MonBrightnessUp exec brightnessctl s +5% | sed -En 's/.*\(([0-9]+)%\).*/\1/p' > $WOBSOCK
-  bindsym XF86MonBrightnessDown exec brightnessctl s 5%- | sed -En 's/.*\(([0-9]+)%\).*/\1/p' > $WOBSOCK
-
-  # Screenshot
-  bindsym Print exec grimshot save screen ~/Pictures/$(date '+%Y-%m-%d-%T')-screenshot.png
-  bindsym Shift+Print exec grimshot save area ~/Pictures/$(date '+%Y-%m-%d-%T')-screenshot.png
-
-  input "type:touchpad" {
-    dwt enabled
-    tap enabled
-    middle_emulation enabled
-    natural_scroll enabled
-  }
-
-  #
-  # Scratchpad:
-  #
-  # Sway has a "scratchpad", which is a bag of holding for windows.
-  # You can send windows there and get them back later.
-
-  # Move the currently focused window to the scratchpad
-  bindsym $mod+Shift+minus move scratchpad
-
-  # Show the next scratchpad window or hide the focused scratchpad window.
-  # If there are multiple scratchpad windows, this command cycles through them.
-  bindsym $mod+minus scratchpad show
-  #
-  # Resizing containers:
-  #
-  mode "resize" {
-      # left will shrink the containers width
-      # right will grow the containers width
-      # up will shrink the containers height
-      # down will grow the containers height
-      bindsym $left resize shrink width 10px
-      bindsym $down resize grow height 10px
-      bindsym $up resize shrink height 10px
-      bindsym $right resize grow width 10px
-
-      # Ditto, with arrow keys
-      bindsym Left resize shrink width 10px
-      bindsym Down resize grow height 10px
-      bindsym Up resize shrink height 10px
-      bindsym Right resize grow width 10px
-
-      # Return to default mode
-      bindsym Return mode "default"
-      bindsym Escape mode "default"
-  }
-  bindsym $mod+r mode "resize"
-
-  #
-  # Status Bar:
-  #
-  # Read `man 5 sway-bar` for more information about this section.
-  bar {
-      position top
-
-      # When the status_command prints a new line to stdout, swaybar updates.
-      # The default just shows the current date and time.
-      status_command while /usr/bin/swaybar-status_command; do sleep 1; done
-
-      colors {
-          statusline $foreground
-          background $background
-          focused_workspace $background_secondary $background_secondary $foreground_secondary
-          active_workspace $background_secondary $background_secondary $foreground_secondary
-          inactive_workspace $background $background $foreground
-      }
-  }
-
-  include /etc/sway/config.d/*
-  EOF
-
-  install -v -D -m 0644 /dev/stdin %{install-root}%{sysconfdir}/sway/config.d/gtk-themes << "EOF"
-  set $schema org.gnome.desktop.interface
-  exec_always {
-    gsettings set org.gtk.Settings.FileChooser window-size "(1000, 500)"
-    gsettings set $schema gtk-theme "Qogir-Light"
-    gsettings set $schema.wm.preferences theme "Qogir-Light"
-    gsettings set $schema icon-theme "Qogir"
-    gsettings set $schema cursor-theme "Qogir"
-    gsettings set $schema font-name "%{font_theme}"
-  }
-  EOF
-
-  install -v -D -m 0755 /dev/stdin %{install-root}%{bindir}/swaybar-status_command << "EOF"
-  # Change this according to your device
-  ################
-  # Variables
-  ################
-
-  # Keyboard input name
-  keyboard_input_name="1:1:AT_Translated_Set_2_keyboard"
-
-  # Date and time
-  date_and_week=$(date "+%Y/%m/%d (w%-V)")
-  current_time=$(date "+%H:%M")
-
-  #############
-  # Commands
-  #############
-
-  # Battery or charger
-  battery_charge=$(upower --show-info $(upower --enumerate | grep 'BAT') | egrep "percentage" | awk '{print $2}')
-  battery_status=$(upower --show-info $(upower --enumerate | grep 'BAT') | egrep "state" | awk '{print $2}')
-
-  # Audio and multimedia
-  audio_volume=$(pamixer --sink `pactl list sinks short | grep -E 'RUNNING|IDLE' | awk '{print $1}'` --get-volume)
-  audio_is_muted=$(pamixer --sink `pactl list sinks short | grep -E 'RUNNING|IDLE' | awk '{print $1}'` --get-mute)
-
-  # Network
-  network=$(ip route get 1.1.1.1 | grep -Po '(?<=dev\s)\w+' | cut -f1 -d ' ')
-  # interface_easyname grabs the "old" interface name before systemd renamed it
-  interface_easyname=$(dmesg | grep $network | grep renamed | awk 'NF>1{print $NF}')
-  ping=$(ping -c 1 www.google.es | tail -1| awk '{print $4}' | cut -d '/' -f 2 | cut -d '.' -f 1)
-
-  # Others
-  language=$(swaymsg -r -t get_inputs | awk '/1:1:AT_Translated_Set_2_keyboard/;/xkb_active_layout_name/' | grep -A1 '\b1:1:AT_Translated_Set_2_keyboard\b' | grep "xkb_active_layout_name" | awk -F '"' '{print $4}')
-  loadavg_5min=$(cat /proc/loadavg | awk -F ' ' '{print $2}')
-
-  if [ $battery_status = "discharging" ];
-  then
-      battery_pluggedin='🔋'
-  else
-      battery_pluggedin='⚡'
-  fi
-
-  if ! [ $network ]
-  then
-     network_active="⛔"
-  else
-     network_active="⇆"
-  fi
-
-  if [ $audio_is_muted = "true" ]
-  then
-      audio_active='🔇'
-  else
-      audio_active='🔊'
-  fi
-
-  POWER_CACHE="/tmp/power_notification"
-
-  charge_num=$(echo $battery_charge | sed 's#%##g')
-
-  update_power_cache() {
-    echo "$(date +%s) $charge_num" > $POWER_CACHE
-  }
-
-  if [ $battery_status == "discharging" ] ; then
-    if [ ! -f $POWER_CACHE ] && [ $charge_num -lt 10 ] ; then
-      notify-send "Low power" "System Power is running low ($charge_num)" 2>/dev/null
-      update_power_cache
-
-    else
-
-      last_date="$(cat $POWER_CACHE | awk '{print $1}')"
-      last_charge="$(cat $POWER_CACHE | awk '{print $1}')"
-      cur_date="$(date +%s)"
-      delta_time=$((last_date - cur_date))
-
-      if [ $delta_time -gt 600000 ] ; then
-        if [ $last_charge -lt 5 ] ; then
-          notify-send "Critical battery level ($charge_num)" "Shutting Down in 20sec" 2>/dev/null
-          sleep 20
-          systemctl suspend-then-hibernate
-        else
-          update_power_cache
-        fi
-      fi
-    fi
-  fi
-
-  echo "  ⌨ $language | $network_active $interface_easyname ($ping ms) | 🏋 $loadavg_5min | $audio_active $audio_volume% | $battery_pluggedin $battery_charge | $date_and_week 🕘 $current_time  "
-  EOF
-
-  install -v -D -m 0644 /dev/stdin %{install-root}%{sysconfdir}/swaylock/config << "EOF"
-  image="%{datadir}/backgrounds/default_blur.jpg"
-  scaling=fill
-
-  indicator-caps-lock
-  indicator-idle-visible
-  indicator-thickness=4
-  
-  # inside-color=%{background_color}
-  # inside-clear-color=%{background_color}
-  # inside-caps-lock-color=%{highlight_color}
-  # inside-ver-color=%{background_secondary_color}
-  
-  # key-hl-color=%{highlight_color}
-
-  # layout-bg-color=%{background_color}
-  # layout-bg-color=%{background_color}
-  # layout-text-color=%{foreground_color}
-
-  # line-color=%{background_color}
-  # line-clear-color=%{background_color}
-  # line-ver-color=%{background_secondary_color}
-
-  font="%{font_theme}"
-  font-size=14
-
-  # line-color=%{border_color}  
-  EOF
-
   install -v -D -m 0644 /dev/stdin %{install-root}%{sysconfdir}/greetd/wlgreet.toml << "EOF"
   command = "sway"
   outputMode = "all"
diff --git a/elements/system/deps.yml b/elements/system/deps.yml
index d595ab4b..163c15f9 100644
--- a/elements/system/deps.yml
+++ b/elements/system/deps.yml
@@ -98,6 +98,7 @@ depends:
   - components/network-manager-applet.yml
   - components/blueman.yml
   - components/ntfs-3g.yml
+  - components/srclang.yml
 
   - components/desktop-shell.yml
   - components/initial-setup.yml
diff --git a/files/sway/config b/files/sway/config
new file mode 100644
index 00000000..b7dbff97
--- /dev/null
+++ b/files/sway/config
@@ -0,0 +1,22 @@
+include /etc/sway/config.d/color-scheme.conf
+include /etc/sway/config.d/fonts.conf
+include /etc/sway/config.d/defaults.conf
+include /etc/sway/config.d/devices.conf
+include /etc/sway/config.d/background.conf
+include /etc/sway/config.d/bindings.conf
+include /etc/sway/config.d/statusbar.conf
+include /etc/sway/config.d/autostart.conf
+
+titlebar_border_thickness       2
+titlebar_padding                5
+title_align                     center
+default_border                  pixel 3
+
+floating_modifier               $Mod normal
+
+# class                 border                     background                 foreground                  indicator        child_border
+client.focused          $BackgroundColor           $BackgroundColor           $ForegroundColor            $HighlightColor  $BorderColor
+client.focused_inactive $BackgroundSecondaryColor  $BackgroundSecondaryColor  $ForegroundSecondaryColor   $HighlightColor  $BackgroundSecondaryColor
+client.unfocused        $BackgroundSecondaryColor  $BackgroundSecondaryColor  $ForegroundSecondaryColor   $HighlightColor  $BackgroundSecondaryColor
+client.urgent           $BackgroundSecondaryColor  $BackgroundSecondaryColor  $ForegroundSecondaryColor   $HighlightColor  $BackgroundSecondaryColor
+client.placeholder      $BackgroundSecondaryColor  $BackgroundSecondaryColor  $ForegroundSecondaryColor   $HighlightColor  $BackgroundSecondaryColor
\ No newline at end of file
diff --git a/files/sway/config.d/autostart.conf b/files/sway/config.d/autostart.conf
new file mode 100644
index 00000000..0f78dca6
--- /dev/null
+++ b/files/sway/config.d/autostart.conf
@@ -0,0 +1,22 @@
+exec swayidle -w                                \
+    timeout 300 'swaylock -f'                   \
+    timeout 600 'swaymsg "output * dpms off"'   \
+        resume 'swaymsg "output * dpms on"'     \
+    before-sleep 'swaylock -f'
+
+set $schema org.gnome.desktop.interface
+exec_always {
+    gsettings set org.gtk.Settings.FileChooser window-size "(1000, 500)"
+    gsettings set $schema gtk-theme "Qogir-Light"
+    gsettings set $schema.wm.preferences theme "Qogir-Light"
+    gsettings set $schema icon-theme "Qogir"
+    gsettings set $schema cursor-theme "Qogir"
+    gsettings set $schema font-name "IBM Plex 12"
+}
+
+exec_always foot --server
+
+exec_always mako --config /etc/xdg/mako/config
+
+exec dbus-update-activation-environment --systemd --all
+exec /usr/lib/xdg-desktop-portal --replace
\ No newline at end of file
diff --git a/files/sway/config.d/background.conf b/files/sway/config.d/background.conf
new file mode 100644
index 00000000..767538c1
--- /dev/null
+++ b/files/sway/config.d/background.conf
@@ -0,0 +1 @@
+output * bg "/usr/share/backgrounds/default.jpg" fill
\ No newline at end of file
diff --git a/files/sway/config.d/bindings.conf b/files/sway/config.d/bindings.conf
new file mode 100644
index 00000000..76088114
--- /dev/null
+++ b/files/sway/config.d/bindings.conf
@@ -0,0 +1,84 @@
+set $Mod Mod4
+
+bindswitch --reload --locked lid:on     output * disabled
+bindswitch --reload --locked lid:off    output * enabled
+
+bindswitch tablet:on            exec TabletMode on
+bindswitch tablet:off           exec TabletMode off
+
+bindsym $Mod+Return             exec $Terminal
+bindsym $Mod+d                  exec $QuickLauncher
+bindsym $Mod+a                  exec $ApplicationLauncher
+
+bindsym $Mod+Shift+q            kill
+bindsym $Mod+Shift+c            reload
+
+bindsym $Mod+Shift+e            exec $Powermenu
+
+bindsym $Mod+Left               focus left
+bindsym $Mod+Right              focus right
+bindsym $Mod+Up                 focus up
+bindsym $Mod+Down               focus down
+
+bindsym $Mod+1                  workspace number 1
+bindsym $Mod+2                  workspace number 2
+bindsym $Mod+3                  workspace number 3
+bindsym $Mod+4                  workspace number 4
+bindsym $Mod+5                  workspace number 5
+bindsym $Mod+6                  workspace number 6
+bindsym $Mod+7                  workspace number 7
+bindsym $Mod+8                  workspace number 8
+bindsym $Mod+9                  workspace number 9
+bindsym $Mod+0                  workspace number 10
+
+bindsym $Mod+Shift+1            move container to workspace number 1
+bindsym $Mod+Shift+2            move container to workspace number 2
+bindsym $Mod+Shift+3            move container to workspace number 3
+bindsym $Mod+Shift+4            move container to workspace number 4
+bindsym $Mod+Shift+5            move container to workspace number 5
+bindsym $Mod+Shift+6            move container to workspace number 6
+bindsym $Mod+Shift+7            move container to workspace number 7
+bindsym $Mod+Shift+8            move container to workspace number 8
+bindsym $Mod+Shift+9            move container to workspace number 9
+bindsym $Mod+Shift+0            move container to workspace number 10
+
+bindsym $Mod+b                  splith
+bindsym $Mod+v                  splitv
+
+bindsym $Mod+s                  layout stacking
+bindsym $Mod+w                  layout tabbed
+bindsym $Mod+e                  layout toggle split
+
+bindsym $Mod+f                  fullscreen
+bindsym $Mod+Shift+space        floating toggle
+bindsym $Mod+space              focus mode_toggle
+
+bindsym XF86AudioMute           exec --no-startup-id "amixer -q set Master toggle"
+bindsym XF86AudioRaiseVolume    exec --no-startup-id "amixer -q set Master 5%+ unmute && pkill -SIGRTMIN+10 i3blocks"
+bindsym XF86AudioLowerVolume    exec --no-startup-id "amixer -q set Master 5%- unmute && pkill -SIGRTMIN+10 i3blocks"
+
+bindsym XF86AudioPrev           exec playerctl previous
+bindsym XF86AudioPlay           exec playerctl play-pause
+bindsym XF86AudioNext           exec playerctl next
+
+bindsym XF86MonBrightnessUp     exec brightnessctl s +5% | sed -En 's/.*\(([0-9]+)%\).*/\1/p'
+bindsym XF86MonBrightnessDown   exec brightnessctl s 5%- | sed -En 's/.*\(([0-9]+)%\).*/\1/p'
+
+bindsym Print                   exec grimshot save screen ~/Pictures/$(date '+%Y-%m-%d-%T')-screenshot.png
+bindsym Shift+Print             exec grimshot save area ~/Pictures/$(date '+%Y-%m-%d-%T')-screenshot.png
+
+bindsym $Mod+Shift+minus        move scratchpad
+bindsym $Mod+minus              scratchpad show
+
+bindgesture swipe:3:up          exec $ApplicationLauncher
+
+bindgesture swipe:3:right       workspace prev
+bindgesture swipe:3:left        workspace next
+
+mode "resize" {
+    bindsym Left                resize shrink   width   10px
+    bindsym Right               resize grow     width   10px
+    bindsym Up                  resize shrink   height  10px
+    bindsym Down                resize grow     height  10px
+}
+bindsym $Mod+r                  mode "resize"
\ No newline at end of file
diff --git a/files/sway/config.d/color-scheme.conf b/files/sway/config.d/color-scheme.conf
new file mode 100644
index 00000000..991d6439
--- /dev/null
+++ b/files/sway/config.d/color-scheme.conf
@@ -0,0 +1,6 @@
+set $BackgroundColor            #EEF1FF
+set $BackgroundSecondaryColor   #D2DAFF
+set $ForegroundColor            #344C64
+set $ForegroundSecondaryColor   #577B8D
+set $BorderColor                #B1B2FF
+set $HighlightColor             #B1B2FF
\ No newline at end of file
diff --git a/files/sway/config.d/defaults.conf b/files/sway/config.d/defaults.conf
new file mode 100644
index 00000000..c883370e
--- /dev/null
+++ b/files/sway/config.d/defaults.conf
@@ -0,0 +1,7 @@
+set $Menu                 bemenu-run --fn "IBM Plex Sans 12"
+set $Terminal             footclient
+set $QuickLauncher        $Menu | xargs swaymsg exec --
+set $Powermenu            $Menu | xargs swaymsg exec --
+set $ApplicationLauncher  $QuickLauncher
+
+seat seat0                xcursor_theme Qogir 24
\ No newline at end of file
diff --git a/files/sway/config.d/devices.conf b/files/sway/config.d/devices.conf
new file mode 100644
index 00000000..2c1bb311
--- /dev/null
+++ b/files/sway/config.d/devices.conf
@@ -0,0 +1,6 @@
+input "type:touchpad" {
+    dwt                 enabled
+    tap                 enabled
+    middle_emulation    enabled
+    natural_scroll      enabled
+}
\ No newline at end of file
diff --git a/files/sway/config.d/fonts.conf b/files/sway/config.d/fonts.conf
new file mode 100644
index 00000000..82e9bbbf
--- /dev/null
+++ b/files/sway/config.d/fonts.conf
@@ -0,0 +1 @@
+font pango: Liberation Sans Regular 12
\ No newline at end of file
diff --git a/files/sway/config.d/statusbar.conf b/files/sway/config.d/statusbar.conf
new file mode 100644
index 00000000..1a8df7ee
--- /dev/null
+++ b/files/sway/config.d/statusbar.conf
@@ -0,0 +1,12 @@
+bar {
+    position top
+    status_command i3blocks
+
+    colors {
+        statusline $ForegroundColor
+        background $BackgroundColor
+        focused_workspace $BackgroundSecondaryColor $BackgroundSecondaryColor $ForegroundSecondaryColor
+        active_workspace $BackgroundSecondaryColor $BackgroundSecondaryColor $ForegroundSecondaryColor
+        inactive_workspace $BackgroundColor $BackgroundColor $ForegroundColor
+    }
+}
\ No newline at end of file
diff --git a/files/swaylock/config b/files/swaylock/config
new file mode 100644
index 00000000..abfbd8de
--- /dev/null
+++ b/files/swaylock/config
@@ -0,0 +1,9 @@
+image="/usr/share/backgrounds/default_blur.jpg"
+scaling=fill
+
+indicator-caps-lock
+indicator-idle-visible
+indicator-thickness=4
+
+font="Liberation Sans"
+font-size=14
\ No newline at end of file
diff --git a/src/srclang b/src/srclang
index dc3dcf8b..30d9b269 160000
--- a/src/srclang
+++ b/src/srclang
@@ -1 +1 @@
-Subproject commit dc3dcf8b2d13db402248a94d645f3b8515db8c60
+Subproject commit 30d9b269f2a2381c06d6541ef505b12477e57857