diff --git a/hyprland/.config/hypr/hypridle.conf b/hyprland/.config/hypr/hypridle.conf
index d6b960912..423313a00 100644
--- a/hyprland/.config/hypr/hypridle.conf
+++ b/hyprland/.config/hypr/hypridle.conf
@@ -6,15 +6,8 @@ general {
 
 listener {
     timeout =  180                               # 3 min.
-    on-timeout = brightnessctl -s set 10         # set monitor backlight to minimum, avoid 0 on OLED monitor.
-    on-resume = brightnessctl -r                 # monitor backlight restore.
-}
-
-# turn off keyboard backlight, comment out this section if you dont have a keyboard backlight.
-listener { 
-    timeout = 180                                       # 3 min.
-    on-timeout = brightnessctl -d kbd_backlight -s set 0% # turn off keyboard backlight.
-    on-resume = brightnessctl -d kbd_backlight -r # turn on keyboard backlight.
+    on-timeout = brightnessctl -s set 10; brightnessctl -d kbd_backlight -s set 0% # set monitor and kbd backlight to minimum
+    on-resume = brightnessctl -r; brightnessctl -d kbd_backlight -r # backlight restore.
 }
 
 listener {
@@ -24,5 +17,5 @@ listener {
 
 listener {
     timeout = 600                                # 10 min
-    on-timeout = systemctl suspend                # suspend pc
+    on-timeout = systemctl suspend               # suspend pc
 }
diff --git a/hyprland/.config/hypr/hyprland.conf b/hyprland/.config/hypr/hyprland.conf
index 1925fac64..22f9e455e 100644
--- a/hyprland/.config/hypr/hyprland.conf
+++ b/hyprland/.config/hypr/hyprland.conf
@@ -143,6 +143,9 @@ windowrulev2 = opacity 0.9, class:(kitty)
 windowrulev2 = opacity 0.9, class:(dunst)
 windowrulev2 = float, class:(imv)
 
+workspace = 1, persistent:true, on-created-empty:firefox
+workspace = 2, persistent:true, on-created-empty:kitty
+
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
 $mainMod = SUPER
 
@@ -213,9 +216,6 @@ bind = $mainMod SHIFT, 0, movetoworkspace, 10
 # bind = $mainMod, S, togglespecialworkspace, magic
 # bind = $mainMod SHIFT, S, movetoworkspace, special:magic
 
-# Scroll through existing workspaces with mainMod + scroll
-bind = $mainMod, mouse_down, workspace, e+1
-bind = $mainMod, mouse_up, workspace, e-1
 
 # Move/resize windows with mainMod + LMB/RMB and dragging
 bindm = $mainMod, Control_L, movewindow
diff --git a/waybar/.config/waybar/config.jsonc b/waybar/.config/waybar/config.jsonc
index 4fd5a01ba..2d97d173a 100644
--- a/waybar/.config/waybar/config.jsonc
+++ b/waybar/.config/waybar/config.jsonc
@@ -34,15 +34,13 @@
     "hyprland/workspaces": {
         "format": "{icon}",
         "format-icons": {
-            "default": "",
-            "active": "",
-            "empty": "",
-            "persistent": "",
-            "special": "",
-            "urgent": "",
+            "1": "󰈹",
+            "2": "",
+            "default": ""
         },
-        "on-scroll-up": "hyprctl dispatch workspace e+1",
-        "on-scroll-down": "hyprctl dispatch workspace e-1"
+        "persistent-workspaces": {
+            "*": 2
+        }
     },
     "wireplumber": {
         "format": "{icon} {volume}%",
diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css
index 5cad0024d..bbce08de7 100644
--- a/waybar/.config/waybar/style.css
+++ b/waybar/.config/waybar/style.css
@@ -1,7 +1,7 @@
 @import "mocha.css";
 
 * {
-    font-family: 'Rubik Medium', 'Font Awesome 6 Free', 'Font Awesome 6 Brands', monospace;
+    font-family: 'Rubik Medium', 'CaskaydiaCove Nerd Font', monospace;
     font-size: 13px;
 }
 
@@ -55,7 +55,7 @@ button:hover {
 }
 
 #workspaces button {
-    padding: 0 5px;
+    padding-right: 12px;
     background-color: transparent;
     color: #ffffff;
 }