diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index 92f52b0..a409377 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -57,7 +57,7 @@ exec-once = /usr/lib/polkit-kde-authentication-agent-1
 exec-once = sleep 1; blueman-applet
 exec-once = hyprpaper
 exec-once = sunsetr
-exec-once = [workspace special:music silent] sleep 1; supersonic-desktop
+exec-once = [workspace 5 silent] sleep 1; supersonic-desktop
 exec-once = dunst
 exec-once = waybar
 exec-once = hypridle
@@ -74,11 +74,11 @@ exec-once = [workspace 8 silent] sleep 2; kitty zsh -c "source ~/.zshrc;nnn -deU
 exec-once = steam -silent
 exec-once = sleep 1; heroic --ozone-platform=wayland 
 exec-once = [workspace special:password silent] keepassxc
-exec-once = [workspace special:scratchpad silent] signal-desktop --ozone-platform-hint=auto --enable-features=UseOzonePlatform,WaylandWindowDecorations
+exec-once = [workspace 12 silent] signal-desktop --ozone-platform-hint=auto --enable-features=UseOzonePlatform,WaylandWindowDecorations
 exec-once = nextcloud
 exec-once = killall nextcloud
 exec-once = gammastep -m wayland -O 6500K -g 1.1.0
-exec-once = [workspace special:email silent] sleep 1; tutanota-desktop --ozone-platform-hint=auto
+exec-once = [workspace 11] sleep 1; tutanota-desktop --ozone-platform-hint=auto
 exec-once = discord --enable-features=UseOzonePlatform --ozone-platform=wayland --start-minimized
 exec-once = jellyfin-mpv-shim 
 
@@ -167,37 +167,25 @@ windowrule {
 
 windowrule {
   name = windowrule-4
-  workspace = special:email silent
-  match:class = tutanota-desktop
-}
-
-windowrule {
-  name = windowrule-5
-  workspace = special:music silent
-  match:class = supersonic-desktop
-}
-
-windowrule {
-  name = windowrule-6
   size = 300 500
   match:title = Friends List
 }
 
 windowrule {
-  name = windowrule-7
+  name = windowrule-5
   center = on
   size = 1600 900
   match:title = Steam
 }
 
 windowrule {
-  name = windowrule-8
+  name = windowrule-6
   float = on
   match:class = steam
 }
 
 windowrule {
-  name = windowrule-9
+  name = windowrule-7
   center = on
   float = on
   size = 1600 900
@@ -205,7 +193,7 @@ windowrule {
 }
 
 windowrule {
-  name = windowrule-10
+  name = windowrule-9
   center = on
   float = on
   size = 1600 900
@@ -213,21 +201,21 @@ windowrule {
 }
 
 windowrule {
-  name = windowrule-11
+  name = windowrule-10
   float = on
   size = 856 656
   match:class = nmnet
 }
 
 windowrule {
-  name = windowrule-12
+  name = windowrule-11
   float = on
   move = (1450) (34)
   match:class = com.nextcloud.desktopclient.nextcloud
 }
 
 windowrule {
-  name = windowrule-13
+  name = windowrule-12
   float = on
   size = 1600 900
   center = on
@@ -235,36 +223,34 @@ windowrule {
 }
 
 windowrule {
-  name = windowrule-14
+  name = windowrule-13
   float = on
   move = (1070) (38)
   match:class = org.pulseaudio.pavucontrol
 }
 
 windowrule {
-  name = windowrule-15
+  name = windowrule-14
   float = on
   size = 1000 600
   match:title = Save File*
 }
 
 windowrule {
-  name = windowrule-16
+  name = windowrule-15
   float = on
   size = 1000 600
   match:title = Open Files
 }
 
 windowrule {
-  name = windowrule-17
-  float = on
+  name = windowrule-16
   center = on
-  size = 1280 720
   match:title = Signal
 }
 
 windowrule {
-  name = windowrule-18
+  name = windowrule-17
   workspace = special:password silent
   float = on
   size = 800 600
@@ -273,7 +259,7 @@ windowrule {
 }
 
 windowrule {
-  name = windowrule-19
+  name = windowrule-18
   float = on
   monitor = DP-1
   size = 600 400
@@ -282,68 +268,68 @@ windowrule {
 }
 
 windowrule {
-  name = windowrule-20
+  name = windowrule-19
   float = on
   match:class = org.kde.polkit-kde-authentication-agent-1
 }
 
 windowrule {
-  name = windowrule-21
+  name = windowrule-20
   float = on
   match:class = alacarte
 }
 
 windowrule {
-  name = windowrule-22
+  name = windowrule-21
   float = on
   match:class = piper
 }
 
 windowrule {
-  name = windowrule-23
+  name = windowrule-22
   float = on
   match:class = nwg-look
 }
 
 windowrule {
-  name = windowrule-24
+  name = windowrule-23
   float = on
   match:class = zenity
 }
 
 windowrule {
-  name = windowrule-25
+  name = windowrule-24
   float = on
   move = (1592) (740)
   match:class = galculator
 }
 
 windowrule {
-  name = windowrule-26
+  name = windowrule-25
   float = on
   match:class = org.rncbc.qsynth
 }
 
 windowrule {
-  name = windowrule-27
+  name = windowrule-26
   float = on
   match:class = qt5ct
 }
 
 windowrule {
-  name = windowrule-28
+  name = windowrule-27
   float = on
   match:class = kvantummanager
 }
 
 windowrule {
-  name = windowrule-29
+  name = windowrule-28
   float = on
   match:class = nm-connection-editor
 }
 
 windowrule {
-  name = windowrule-30
+  name = windowrule-29
   float = on
   size = 334 212
   center = on
@@ -351,40 +337,40 @@ windowrule {
 }
 
 windowrule {
-  name = windowrule-31
+  name = windowrule-30
   float = on
   move = (834) (43)
   match:class = gsimplecal
 }
 
 windowrule {
-  name = windowrule-32
+  name = windowrule-31
   float = on
   center = on
   match:class = imv
 }
 
 windowrule {
-  name = windowrule-33
+  name = windowrule-32
   float = on
   center = on
   match:class = org.pwmt.zathura
 }
 
 windowrule {
-  name = windowrule-34
+  name = windowrule-33
   idle_inhibit = fullscreen
   match:fullscreen = 1
 }
 
 windowrule {
-  name = windowrule-35
+  name = windowrule-34
   float = on
   match:class = xdg-desktop-portal-gtk
 }
 
 windowrule {
-  name = windowrule-36
+  name = windowrule-35
   float = on
   center = on
   move = (1310) (40)
@@ -410,9 +396,7 @@ bind = $mainMod CTRL, T, exec, steam
 bind = $mainMod, R, exec, retroarch --appendconfig /home/peter/.config/retroarch/config/retroarch.cfg
 bind = $mainMod CTRL, Y, exec, heroic
 bind = $mainMod, N, exec, dunstctl context
-bind = $mainMod CTRL, U, exec, [workspace special:scratchpad silent] signal-desktop --ozone-platform-hint=auto --enable-features=UseOzonePlatform,WaylandWindowDecorations
 bind = $mainMod CTRL, P, exec, [workspace special:password silent] keepassxc
-bind = $mainMod CTRL, M, exec, [workspace special:music silent] sleep 1; supersonic-desktop
 
 # Resize windows main keybind
 bind=ALT,R,submap,resize
@@ -522,7 +506,7 @@ workspace = 1, monitor:DP-1, default:true
 workspace = 2, monitor:DP-1
 workspace = 3, monitor:DP-1
 workspace = 4, monitor:DP-1
-workspace = 5, monitor:DP-1
+workspace = 5, monitor:DP-2
 workspace = 6, monitor:DP-2, default:true
 workspace = 7, monitor:DP-2
 workspace = 8, monitor:DP-2
@@ -533,12 +517,8 @@ workspace = 12, monitor:DP-2
 
 # Special workspaces
 
-bind = $mainMod, U, togglespecialworkspace, scratchpad
-bind = $mainMod SHIFT, S, movetoworkspace, special:scratchpad
 
-bind = $mainMod, M, togglespecialworkspace, music 
 bind = $mainMod, O, togglespecialworkspace, password 
-bind = $mainMod, I, togglespecialworkspace, email
 
 # Scroll through existing workspaces with Mod + scroll
 
diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf
index f2e2a07..4ed6282 100644
--- a/.config/hypr/hyprlock.conf
+++ b/.config/hypr/hyprlock.conf
@@ -1,7 +1,7 @@
 # BACKGROUND
 background {
     monitor = DP-1
-    path = ~/.wallpapers/castlevania3.png
+    path = ~/.wallpapers/castlevania4.png
     blur_size = 3
     blur_passes = 2
     noise = 0.06
@@ -13,7 +13,7 @@ background {
 
 background {
     monitor = DP-2
-    path = ~/.wallpapers/castlevania4.png
+    path = ~/.wallpapers/castlevania3.png
     blur_size = 3
     blur_passes = 2
     noise = 0.06
diff --git a/.config/waybar/config b/.config/waybar/config
index 949942b..eacfadc 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -1,109 +1,20 @@
 [{ 
     "output": "DP-2", 
     "layer": "top",
-    "modules-left": ["hyprland/window"],
-    "modules-center": ["hyprland/mode"],
-    "hyprland/window": {
-       "format": "<span color=\"#f8f8f2\">{title}</span>  ",
-       "max-length": 60,
-       "icon": true,
-       "icon-size": 20,
-       "all-outputs" : true,  
-    },
-   }, {
-    "output": "DP-1",
-    "layer": "top",  
-    "modules-left": ["hyprland/workspaces", "hyprland/mode"],
-    "modules-center": ["group/statistics", "group/status", "temperature", "custom/pacman", "group/networks", "bluetooth", "group/audio-player"],
-    /* "modules-right": ["tray", "custom/scratchpad-indicator", "pulseaudio",], */
+    "modules-left": ["hyprland/workspaces"],
+    "modules-center": ["hyprland/mode", ],
     "modules-right": ["group/taskbar", "group/group-power"],
 
-    "hyprland/mode": {
-        "format": "  󰹶  {}"
-    },
-    "hyprland/workspaces": {
-        "format": "{icon}",
-        "all-outputs": true,
-        "on-click": "activate",
-        "format-icons": {
-            "1": "󰈹",
-            "2": "󰷈",
-            "3": "󱇤",
-            "4": "",
-            "5": "󰙵",
-            "6": "",
-            "7": "󰟀",
-            "8": "",
-            "9": "󰒋",
-            "10": "󱀁",
-            "11": "󰙵",
-            "12": "󰙵",
-         },
-         "sort-by-number": true
-    },
-    "group/audio-player": {
+    "group/taskbar": {
             "orientation": "inherit",
             "modules": [
-                    "group/playing",
-             ]
-         }, 
-    "group/playing": {
-            "orientation": "inherit",
-    "drawer": {
-        "transition-duration": 500,
-        "children-class": "not-power",
-        "transition-left-to-right": true,
-    },
-            "modules": [
-                    "mpris",
-                    "mpris#2"
+                    "tray",
+                    "pulseaudio"
              ]
          },
-"mpris": {
-	"format": "<span color=\"#bd93f9\">{player_icon}</span> <span color=\"#f8f8f2\">Playing </span>",
-	"format-paused": "<span color=\"#bd93f9\">{status_icon}</span> <span color=\"#f8f8f2\">Paused </span>",
-        "tooltip-format": "󰠃 {artist}:  {title} (󰀥 {album})",
-        "interval": 1,
-        "album-len": 0,
-        "on-click": "exec ~/.bin/sh/dunstaudio.sh play_pause",
-        "on-click-right": "exec ~/.bin/sh/dunstaudio.sh next_track",
-        "on-click-middle": "exec ~/.bin/sh/dunstaudio.sh prev_track",
-	"player-icons": {
-		"default": "",
-		"mpv": ""
-	},
-	"status-icons": {
-		"paused": "",
-	},
-//	"ignored-players": ["firefox"] 
-    },
-"mpris#2": {
-	"format": "<span color=\"#8be9fd\"> </span><span color=\"#f8f8f2\">{title} </span><span color=\"#ff79c6\">󰠃 </span><span color=\"#f8f8f2\">{artist} <small>({position}/{length}) </small></span>",
-	"format-paused": "<span color=\"#8be9fd\"> </span><span color=\"#f8f8f2\">{title} </span><span color=\"#ff79c6\">󰠃 </span><span color=\"#f8f8f2\">{artist} <small>({position}/{length}) </small></span>",
-        "tooltip-format": "󰠃 {artist}:  {title} (󰀥 {album})",
-        "interval": 1,
-        "album-len": 0,
-        "on-click": "exec ~/.bin/sh/dunstaudio.sh play_pause",
-        "on-click-right": "exec ~/.bin/sh/dunstaudio.sh next_track",
-        "on-click-middle": "exec ~/.bin/sh/dunstaudio.sh prev_track",
-    },
-    "group/statistics": {
-            "orientation": "inherit",
-            "modules": [
-                    "custom/gpu-usage",
-                    "cpu",
-                    "memory",
-                    "group/disks"
-             ]
-         },
-    "custom/pacman": {
-        "format": "<span color=\"#8BE9FD\"> </span>{}",
-        "tooltip": true,
-        "tooltip-format": "Available updates",
-        "interval": 60,             
-        "exec": "checkupdates | wc -l",      
-        "exec-if": "exit 0",
-        "signal": 8
+    "tray": {
+        "icon-size": 20,
+        "spacing": 6
     },
     "group/group-power": {
     "orientation": "inherit",
@@ -133,6 +44,110 @@
         "tooltip": false,
         "on-click": "shutdown -h now"
     },
+    "hyprland/workspaces": {
+        "format": "{icon}",
+        "all-outputs": true,
+        "on-click": "activate",
+        "format-icons": {
+            "1": "󰈹",
+            "2": "󰷈",
+            "3": "󱇤",
+            "4": "",
+            "5": "",
+            "6": "",
+            "7": "󰟀",
+            "8": "",
+            "9": "󰒋",
+            "10": "󱀁",
+            "11": "󰇮",
+            "12": "󰭹",
+         },
+         "sort-by-number": true
+    },
+   }, {
+    "output": "DP-1",
+    "layer": "top",  
+    "modules-left": ["hyprland/mode", "hyprland/window"],
+    "modules-center": ["group/statistics", "group/status", "temperature", "custom/pacman", "group/networks", "bluetooth"],
+    "modules-right": ["group/audio-player"],
+    /* "modules-right": ["tray", "custom/scratchpad-indicator", "pulseaudio",], */
+    "hyprland/mode": {
+        "format": "  󰹶  {}"
+    },
+    "hyprland/window": {
+       "format": "<span color=\"#f8f8f2\">{title}</span>  ",
+       "max-length": 60,
+       "icon": true,
+       "icon-size": 20,
+       "all-outputs" : true,  
+    },
+
+    "group/audio-player": {
+            "orientation": "inherit",
+            "modules": [
+                    "group/playing",
+             ]
+         }, 
+    "group/playing": {
+            "orientation": "inherit",
+    "drawer": {
+        "transition-duration": 500,
+        "children-class": "not-power",
+        "transition-left-to-right": true,
+    },
+            "modules": [
+                    "mpris",
+                    "mpris#2"
+             ]
+         },
+"mpris": {
+	"format": "<span color=\"#bd93f9\">{player_icon}</span> <span color=\"#f8f8f2\">Playing now</span>  ",
+	"format-paused": "<span color=\"#bd93f9\">{status_icon}</span> <span color=\"#f8f8f2\">Paused </span>  ",
+        "tooltip-format": "󰠃 {artist}:  {title} (󰀥 {album})",
+        "interval": 1,
+        "album-len": 0,
+        "on-click": "exec ~/.bin/sh/dunstaudio.sh play_pause",
+        "on-click-right": "exec ~/.bin/sh/dunstaudio.sh next_track",
+        "on-click-middle": "exec ~/.bin/sh/dunstaudio.sh prev_track",
+	"player-icons": {
+		"default": "",
+		"mpv": ""
+	},
+	"status-icons": {
+		"paused": "",
+	},
+//	"ignored-players": ["firefox"] 
+    },
+"mpris#2": {
+	"format": "<span color=\"#8be9fd\"> </span><span color=\"#f8f8f2\">{title} </span><span color=\"#ff79c6\">󰠃 </span><span color=\"#f8f8f2\">{artist} <small>({position}/{length}) </small></span>",
+	"format-paused": "<span color=\"#8be9fd\"> </span><span color=\"#f8f8f2\">{title} </span><span color=\"#ff79c6\">󰠃 </span><span color=\"#f8f8f2\">{artist} <small>({position}/{length}) </small></span>",
+        "tooltip-format": "󰠃 {artist}:  {title} (󰀥 {album})",
+        "interval": 1,
+        "album-len": 0,
+        "on-click": "exec ~/.bin/sh/dunstaudio.sh play_pause",
+        "on-click-right": "exec ~/.bin/sh/dunstaudio.sh next_track",
+        "on-click-middle": "exec ~/.bin/sh/dunstaudio.sh prev_track",
+//	"ignored-players": ["firefox"] 
+    },
+    "group/statistics": {
+            "orientation": "inherit",
+            "modules": [
+                    "custom/gpu-usage",
+                    "cpu",
+                    "memory",
+                    "group/disks"
+             ]
+         },
+    "custom/pacman": {
+        "format": "<span color=\"#8BE9FD\"> </span>{}",
+        "tooltip": true,
+        "tooltip-format": "Available updates",
+        "interval": 60,             
+        "exec": "checkupdates | wc -l",      
+        "exec-if": "exit 0",
+        "signal": 8
+    },
+
     "group/networks": {
             "orientation": "inherit",
             "modules": [
@@ -161,17 +176,7 @@
         },
 		"on-click": "toggleRemote"
     },
-    "group/taskbar": {
-            "orientation": "inherit",
-            "modules": [
-                    "tray",
-                    "pulseaudio"
-             ]
-         },
-    "tray": {
-        "icon-size": 20,
-        "spacing": 6
-    },
+
     "group/status": {
             "orientation": "inherit",
             "modules": [