diff --git a/.config/Trolltech.conf b/.config/Trolltech.conf
index 1467c9f..48af022 100644
--- a/.config/Trolltech.conf
+++ b/.config/Trolltech.conf
@@ -1,2 +1,2 @@
 [Qt]
-style = Materia-dark
+style=Materia-dark
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 1ff9f4b..07c2926 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -52,7 +52,7 @@ end
 -- Themes define colours, icons, font and wallpapers.
 beautiful.init(gears.filesystem.get_configuration_dir() .. "theme.lua")
 
-terminal = "kitty"
+terminal = "alacritty"
 editor = os.getenv("EDITOR") or "nvim"
 editor_cmd = terminal .. " -e " .. editor
 
@@ -136,7 +136,7 @@ awful.screen.connect_for_each_screen(
 
         -- Each screen has its own tag table.
         awful.tag(
-            {"TTY", "WEB", "DEV", "SBX", "GAM", "DOC", "GFX", "SRV", "ETC"},
+            {"TTY", "WEB", "DEV", "SBX", "GAM", "MED", "SYS", "SRV", "ETC"},
             s,
             awful.layout.layouts[1]
         )
diff --git a/.config/nvim/pack/plugins/opt/black b/.config/nvim/pack/plugins/opt/black
index 21218b6..c0cc19b 160000
--- a/.config/nvim/pack/plugins/opt/black
+++ b/.config/nvim/pack/plugins/opt/black
@@ -1 +1 @@
-Subproject commit 21218b666aeafd1c089cbe998e730f97605d25b2
+Subproject commit c0cc19b5b3371842d696875897bebefebd5e1596
diff --git a/.config/nvim/pack/plugins/opt/nvim-lspconfig b/.config/nvim/pack/plugins/opt/nvim-lspconfig
index 520c609..636ce36 160000
--- a/.config/nvim/pack/plugins/opt/nvim-lspconfig
+++ b/.config/nvim/pack/plugins/opt/nvim-lspconfig
@@ -1 +1 @@
-Subproject commit 520c609210029e901b433c49e7c1e00dd247b47a
+Subproject commit 636ce36c30725391486377850bf8460dc0723ae2
diff --git a/.config/nvim/pack/plugins/opt/nvim-treesitter b/.config/nvim/pack/plugins/opt/nvim-treesitter
index 840994d..f3c53d2 160000
--- a/.config/nvim/pack/plugins/opt/nvim-treesitter
+++ b/.config/nvim/pack/plugins/opt/nvim-treesitter
@@ -1 +1 @@
-Subproject commit 840994db95313b97328f33b772cc18081baf461f
+Subproject commit f3c53d225ada93a99bfd818e1c40012400e2dc55
diff --git a/.config/sway/config.d/10-variables.conf b/.config/sway/config.d/10-variables.conf
index 596c5e9..144a928 100644
--- a/.config/sway/config.d/10-variables.conf
+++ b/.config/sway/config.d/10-variables.conf
@@ -6,7 +6,7 @@ set $up    j
 set $right l
 
 set $menu               dmenu_path | dmenu | xargs swaymsg exec --
-set $term               kitty
+set $term               alacritty
 set $browser            firefox
 set $files              pcmanfm
 set $wallpapers         $HOME/.config/wallpapers
@@ -24,8 +24,8 @@ set $ws3 3:DEV
 set $ws4 4:SBX
 set $ws5 5:GAM
 set $ws6 6:MED
-set $ws7 7:DOC
-set $ws8 8:GFX
+set $ws7 7:SYS
+set $ws8 8:SRV
 set $ws9 9:ETC
 
 #               border      background  text        indicator   child_border
diff --git a/.config/sway/config.d/40-hotkeys.conf b/.config/sway/config.d/40-hotkeys.conf
index 90832af..f8b55e1 100644
--- a/.config/sway/config.d/40-hotkeys.conf
+++ b/.config/sway/config.d/40-hotkeys.conf
@@ -47,6 +47,10 @@
     bindsym $mod+Shift+$up      move up
     bindsym $mod+Shift+$right   move right
 
+    # Move the focused workspace with the same, but add Control
+    bindsym $mod+Control+$down move workspace to left
+    bindsym $mod+Control+$up   move workspace to right
+
 ## Workspaces:
     # Switch to workspace
     bindsym $mod+1 workspace $ws1
diff --git a/.config/waybar/config b/.config/waybar/config
index 10a38ee..af55e0b 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -1,8 +1,7 @@
 {
     "modules-left": ["sway/workspaces"],
     "modules-center": ["sway/window"],
-    //"modules-right": ["pulseaudio", "cpu", "memory", "temperature", "backlight", "battery", "tray", "clock"],
-    "modules-right": ["pulseaudio", "cpu", "memory", "temperature", "backlight", "battery", "tray", "custom/clock"],
+    "modules-right": ["pulseaudio", "cpu", "memory", "temperature", "backlight", "battery", "tray", "clock"],
     "backlight": {
         "format": "{percent}% {icon}",
         "format-icons": ["", ""],
@@ -21,13 +20,9 @@
         "format-alt": "{time} {icon}",
         "format-icons": ["", "", "", "", ""],
     },
-    //"clock": {
-    //    "format": "{:%a %b %d, %R}",
-    //    "tooltip-format": "<tt>{calendar}</tt>",
-    //},
-    "custom/clock": {
-        "exec": "date '+%a %b %d, %R'",
-        "interval": 5,
+    "clock": {
+        "format": "{:%a %b %d, %R}",
+        "tooltip-format": "<tt>{calendar}</tt>",
     },
     "cpu": {
         "format": "{usage}% ",
diff --git a/.xinitrc b/.xinitrc
index 3d8f6b6..cf93860 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -7,4 +7,4 @@ xrandr                               \
 # fix touchscreen
 xinput --map-to-output 'Raydium Corporation Raydium Touch System' 'eDP-1'
 
-exec x-window-manager
+exec awesome