diff --git a/home/hyprland/hyprland.conf b/home/hyprland/hyprland.conf
index a6b2bb12..f34d28f5 100644
--- a/home/hyprland/hyprland.conf
+++ b/home/hyprland/hyprland.conf
@@ -154,17 +154,37 @@ windowrule = workspace name:remote,(Nxplayer.bin)
 windowrulev2 = float,class:(Nxplayer.bin),title:^(NoMachine)$
 # windowrulev2 = nofloat,class:(Nxplayer.bin),title:^(NoMachine).+$
 
-bind = SUPER, bracketright, focusmonitor, +1
-bind = SUPER, bracketleft, focusmonitor, -1
-bind = SUPER SHIFT, bracketright, movecurrentworkspacetomonitor, +1
-bind = SUPER SHIFT, bracketleft, movecurrentworkspacetomonitor, -1
+# Numbered workspaces
+bind = SUPER, 1, workspace, 1
+bind = SUPER SHIFT, 1, movetoworkspace, 1
+bind = SUPER, 2, workspace, 2
+bind = SUPER SHIFT, 2, movetoworkspace, 2
+bind = SUPER, 3, workspace, 3
+bind = SUPER SHIFT, 3, movetoworkspace, 3
+bind = SUPER, 4, workspace, 4
+bind = SUPER SHIFT, 4, movetoworkspace, 4
+bind = SUPER, 5, workspace, 5
+bind = SUPER SHIFT, 5, movetoworkspace, 5
+bind = SUPER, 6, workspace, 6
+bind = SUPER SHIFT, 6, movetoworkspace, 6
+bind = SUPER, 7, workspace, 7
+bind = SUPER SHIFT, 7, movetoworkspace, 7
+bind = SUPER, 8, workspace, 8
+bind = SUPER SHIFT, 8, movetoworkspace, 8
+bind = SUPER, 9, workspace, 9
+bind = SUPER SHIFT, 9, movetoworkspace, 9
 
+# Special workspaces
 bind = SUPER, N, workspace, empty
 bind = SUPER SHIFT, N, movetoworkspace, empty
 bind = SUPER, minus, togglespecialworkspace
 bind = SUPER SHIFT, minus, movetoworkspace, special
 bind = SUPER, tab, workspace, previous
 bind = SUPER SHIFT, tab, movetoworkspace, previous
+bind = SUPER, bracketright, focusmonitor, +1
+bind = SUPER SHIFT, bracketright, movecurrentworkspacetomonitor, +1
+bind = SUPER, bracketleft, focusmonitor, -1
+bind = SUPER SHIFT, bracketleft, movecurrentworkspacetomonitor, -1
 
 # Move/resize windows with mainMod + LMB/RMB and dragging
 bindm = SUPER, mouse:272, movewindow
@@ -186,7 +206,6 @@ windowrule = move 100%-820 10%,(nm-connection-editor)
 windowrule = float,(otpclient)
 windowrule = move 10% 10%,(otpclient)
 
-exec-once = dunst
 exec-once = hyprpaper
 exec-once = waybar
 source = ./autostart.conf
diff --git a/home/hyprland/waybar/modules/wlr_workspaces.nix b/home/hyprland/waybar/modules/wlr_workspaces.nix
index 726ef11c..7be52b23 100644
--- a/home/hyprland/waybar/modules/wlr_workspaces.nix
+++ b/home/hyprland/waybar/modules/wlr_workspaces.nix
@@ -11,6 +11,15 @@
     "music" = "󰲸";
     "pass" = "󰌾";
     "remote" = "󰢹";
+    "1" = "󰎦";
+    "2" = "󰎩";
+    "3" = "󰎬";
+    "4" = "󰎮";
+    "5" = "󰎰";
+    "6" = "󰎵";
+    "7" = "󰎸";
+    "8" = "󰎻";
+    "9" = "󰎾";
     urgent = "󱈸";
   };
   sort-by-name = true;
diff --git a/home/wezterm/wezterm.lua b/home/wezterm/wezterm.lua
index 7115e8b0..6217f13d 100644
--- a/home/wezterm/wezterm.lua
+++ b/home/wezterm/wezterm.lua
@@ -10,21 +10,21 @@ if wezterm.config_builder then config = wezterm.config_builder() end
 
 -- This is where you actually apply your config choices
 config.set_environment_variables = {
-    TERMINFO_DIRS = "/home/user/.nix-profile/share/terminfo",
-    WSLENV = "TERMINFO_DIRS",
+  TERMINFO_DIRS = "/home/user/.nix-profile/share/terminfo",
+  WSLENV = "TERMINFO_DIRS",
 }
 config.audible_bell = "Disabled"
 config.font_size = 14
--- config.window_background_opacity = 0.80
--- config.macos_window_background_blur = 20
+config.window_background_opacity = 0.80
+config.macos_window_background_blur = 20
 config.color_scheme = "tokyonight_night"
 config.hide_tab_bar_if_only_one_tab = true
 config.hide_mouse_cursor_when_typing = true
 config.window_padding = {
-    left = 5,
-    right = 5,
-    top = 5,
-    bottom = 5,
+  left = 5,
+  right = 5,
+  top = 5,
+  bottom = 5,
 }
 
 -- and finally, return the configuration to wezterm