diff --git a/apps/firefox/default.nix b/apps/firefox/default.nix
index 0204d47..e867b43 100644
--- a/apps/firefox/default.nix
+++ b/apps/firefox/default.nix
@@ -25,6 +25,7 @@
     windowrulev2 = [
       "workspace special:youtube, class:^(youtube)$"
       "workspace special:jellyfin, class:^(jellyfin)$"
+      "opacity 1.0 1.0, class:^(firefox)$"
     ];
   };
   imports = [
diff --git a/apps/hyprland/hypr/general.nix b/apps/hyprland/hypr/general.nix
index 8da2497..e339bdd 100644
--- a/apps/hyprland/hypr/general.nix
+++ b/apps/hyprland/hypr/general.nix
@@ -5,11 +5,12 @@
       gaps_out = 15;
       layout = "dwindle";
       allow_tearing = true;
+      resize_on_border = true;
     };
     decoration = {
       rounding = 0;
       active_opacity = 0.99;
-      inactive_opacity = 0.95;
+      inactive_opacity = 0.7;
       shadow = {
         enabled = true;
         range = 2;
@@ -20,6 +21,7 @@
         enabled = true;
         size = 8;
         passes = 2;
+        new_optimizations = true;
         special = true;
         brightness = 0.60;
         contrast = 0.75;
diff --git a/apps/waybar/default.nix b/apps/waybar/default.nix
index b9bf3a3..e810f37 100644
--- a/apps/waybar/default.nix
+++ b/apps/waybar/default.nix
@@ -116,18 +116,39 @@ in {
           all-outputs = true;
           format = "{icon}";
           format-icons = {
+            "music" = "󰎆";
+            "gaming" = "󰊖";
+            "steam" = "󰓓";
             "default" = "";
+            "active" = "󱓻";
+
+            # Numbered workspaces 1-5
             "1" = "1";
             "2" = "2";
             "3" = "3";
             "4" = "4";
             "5" = "5";
-            "6" = "6";
-            "7" = "7";
-            "8" = "8";
-            "9" = "9";
-            "10" = "0";
-            "active" = "󱓻";
+
+            # Kanji for workspaces 6-10
+            "6" = "六";
+            "7" = "七";
+            "8" = "八";
+            "9" = "九";
+            "10" = "十";
+
+            # Dice for workspaces 11-15
+            "11" = "⚀";
+            "12" = "⚁";
+            "13" = "⚂";
+            "14" = "⚃";
+            "15" = "⚄";
+
+            # Circled numbers for 16-20
+            "16" = "⑯";
+            "17" = "⑰";
+            "18" = "⑱";
+            "19" = "⑲";
+            "20" = "⑳";
           };
           persistent-workspaces = {
             "1" = [];
@@ -143,17 +164,13 @@ in {
           show-special = true;
           special-visible-only = true;
           all-outputs = true;
-          ignore-workspaces = ["^[0-9]+$"];
+          ignore-workspaces = ["^([0-9]+|gaming|steam|music)$"];
           format = "{icon}";
           format-icons = {
             "special:youtube" = "󰗃";
-            "special:music" = "󰎆";
-            "special:steam" = "󰓓";
             "special:custom" = "󱗼";
             "special:preload" = "󱗼";
             "youtube" = "󰗃";
-            "music" = "󰎆";
-            "steam" = "󰓓";
             "custom" = "󱗼";
             "preload" = "󱗼";
             "default" = "󱗼";
diff --git a/modules/home/gaming.nix b/modules/home/gaming.nix
index e92969e..7b31d76 100644
--- a/modules/home/gaming.nix
+++ b/modules/home/gaming.nix
@@ -61,22 +61,26 @@ in {
   wayland.windowManager.hyprland.settings = {
     workspace = [
       "name:gaming, monitor:0, default:true"
+      "name:steam, monitor:0, default:true"
     ];
 
     exec-once = [
-      "[workspace special:steam silent] uwsm app -- steam"
+      # No longer launching steam on startup
+      # "[workspace special:steam silent] uwsm app -- steam"
     ];
 
     bindd = [
-      "SUPER, A, Toggle Steam, togglespecialworkspace, steam"
-      "SUPER SHIFT, A, Move to Steam Special Workspace, movetoworkspace, special:steam"
+      # "SUPER, A, Toggle Steam, togglespecialworkspace, steam"
+      # "SUPER SHIFT, A, Move to Steam Special Workspace, movetoworkspace, special:steam"
       "SUPER, G, Switch to Gaming Workspace, workspace, name:gaming"
+      "SUPER, A, Switch to Steam Workspace, workspace, name:steam"
     ];
 
     windowrulev2 =
       [
         # --- STEAM LAUNCHER RULES ---
-        "workspace special:steam silent, class:^(steam)$"
+        "workspace name:steam, class:^(steam)$"
+        # "workspace special:steam silent, class:^(steam)$"
         "noinitialfocus, class:^(steam)$"
         "suppressevent activate, class:^(steam)$"
       ]
diff --git a/modules/home/music.nix b/modules/home/music.nix
index b03714d..8917978 100644
--- a/modules/home/music.nix
+++ b/modules/home/music.nix
@@ -34,22 +34,22 @@ in {
 
   wayland.windowManager.hyprland.settings = {
     workspace = [
-      "special:music, on-created-empty:hakase-music-launch"
+      "name:music, on-created-empty:hakase-music-launch"
     ];
 
     bindd = [
-      "SUPER, M, Toggle Music, togglespecialworkspace, music"
-      "SUPER SHIFT, M, Move to Music Special Workspace, movetoworkspace, special:music"
+      "SUPER, M, Switch to Music, workspace, name:music"
+      "SUPER SHIFT, M, Move to Music Workspace, movetoworkspace, name:music"
     ];
 
     windowrulev2 = [
       # --- MUSIC RULES (Jellyfin-TUI) ---
-      "workspace special:music silent, title:^(jellyfin-tui)$"
-      "workspace special:music silent, initialTitle:^(jellyfin-tui)$"
+      "workspace name:music silent, title:^(jellyfin-tui)$"
+      "workspace name:music silent, initialTitle:^(jellyfin-tui)$"
 
       # --- CAVA RULES ---
-      "workspace special:music silent, title:^(cava)$"
-      "workspace special:music silent, initialTitle:^(cava)$"
+      "workspace name:music silent, title:^(cava)$"
+      "workspace name:music silent, initialTitle:^(cava)$"
     ];
   };
 }