diff --git a/system/home/desktop/hyprland.nix b/system/home/desktop/hyprland.nix
index 9699c7ea..10c7b475 100644
--- a/system/home/desktop/hyprland.nix
+++ b/system/home/desktop/hyprland.nix
@@ -171,9 +171,7 @@
         "${config.wayland.windowManager.hyprland.finalPackage}/bin/hyprctl setcursor ${config.gtk.cursorTheme.name} ${toString config.gtk.cursorTheme.size}"
         "${pkgs.libsForQt5.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1"
         "PASSWORD_STORE_DIR=/dev/null ${pkgs.protonmail-bridge}/bin/protonmail-bridge -n"
-        "${pkgs.dex}/bin/dex -a"
-        # "systemctl --user start hyprland-session.target"
-        # "systemctl --user start hyprpaper.service"
+        "sleep 5; ${pkgs.dex}/bin/dex -a"
       ];
       gestures.workspace_swipe = true;
       input = {
@@ -205,7 +203,7 @@
         drop_at_cursor = true;
       };
       general = {
-        "col.active_border" = lib.mkForce "rgb(${config.lib.stylix.scheme.base0E})";
+        "col.active_border" = lib.mkForce "rgb(${config.lib.stylix.scheme.magenta})";
         gaps_in = 2.5;
         gaps_out = 5;
         border_size = 1;
@@ -279,6 +277,13 @@
         "size 800 600, xdg-desktop-portal-gtk"
         "center, xdg-desktop-portal-gtk"
 
+        # Workspace rules
+        "workspace 2, firefox" # Browser
+        "workspace 3, (signal|whatsapp-for-linux|WebCord|teams-for-linux)" # Messaging
+        "workspace 4, (com.github.neithern.g4music|com.github.rafostar.Clapper)" # Media
+        "workspace 5, (org.remmina.Remmina|Nxplayer.bin)" # Remote Desktop
+        "workspace 6 silent, (steam|steam_app|lutris|page.kramo.Cartridges|org.prismlauncher.PrismLauncher)" # Gaming
+
         # PrismLauncher / Minecraft
         "float, org.prismlauncher.PrismLauncher"
         "center, org.prismlauncher.PrismLauncher"
diff --git a/system/home/desktop/waybar.nix b/system/home/desktop/waybar.nix
index adb77369..1d5882a4 100644
--- a/system/home/desktop/waybar.nix
+++ b/system/home/desktop/waybar.nix
@@ -36,14 +36,13 @@
       "hyprland/workspaces" = {
         format = "{icon}";
         format-icons = {
-          "1" = "󰫃 ";
-          "2" = "󰫄 ";
-          "3" = "󰫅 ";
-          "4" = "󰫆 ";
-          "5" = "󰫇 ";
-          "6" = "󰫈 ";
-          default = "󰋙 ";
-          urgent = "󰁡 ";
+          "1" = "󰆍 ";
+          "2" = "󰈹 ";
+          "3" = "󰭹 ";
+          "4" = "󰝚 ";
+          "5" = "󰢹 ";
+          "6" = "󰓓 ";
+          default = "󰀻 ";
         };
         all-outputs = false;
         persistent-workspaces = {