diff --git a/homeManagerModules/desktopEnv/hypr/default.nix b/homeManagerModules/desktopEnv/hypr/default.nix
index 96f7d515..08a43a74 100644
--- a/homeManagerModules/desktopEnv/hypr/default.nix
+++ b/homeManagerModules/desktopEnv/hypr/default.nix
@@ -63,13 +63,14 @@
     wayland.windowManager.hyprland.enable = true;
     wayland.windowManager.hyprland.extraConfig = let
       modifier = "SUPER";
+
       # Default apps
       browser = pkgs.firefox + "/bin/firefox";
       fileManager = pkgs.xfce.thunar + "/bin/thunar";
       editor = pkgs.vscodium + "/bin/codium";
       terminal = pkgs.alacritty + "/bin/alacritty";
 
-      # Hyprland shell utilities
+      # Hyprland desktop utilities
       bar = pkgs.waybar + "/bin/waybar";
       launcher = pkgs.fuzzel + "/bin/fuzzel";
       notifyd = pkgs.mako + "/bin/mako";
@@ -81,13 +82,13 @@
       hyprshade = pkgs.hyprshade + "/bin/hyprshade";
 
       # Media/hardware commands
-      brightness = "${pkgs.brightnessctl}/bin/brightnessctl ";
+      brightness = "${pkgs.brightnessctl}/bin/brightnessctl";
       brightness_up = "${brightness} set 5%+";
       brightness_down = "${brightness} set 5%-";
       volume = "${pkgs.wireplumber}/bin/wpctl";
       volume_up = "${volume} set-volume -l 1.0 @DEFAULT_SINK@ 5%+";
       volume_down = "${volume} set-volume -l 1.0 @DEFAULT_SINK@ 5%-";
-      mute = "${volume} set-mute @DEFAULT_SINK@ toggle";
+      volume_mute = "${volume} set-mute @DEFAULT_SINK@ toggle";
       media = "${pkgs.playerctl}/bin/playerctl";
       media_play = "${media} play-pause";
       media_next = "${media} next";
@@ -106,221 +107,220 @@
       qt_platform_theme = "gtk";
 
     in ''
-      monitor=desc:BOE 0x0BCA,preferred,auto,1.566667 # lavaridge fw13 matte display
-      monitor=desc:BOE 0x095F,preferred,auto,1.566667# lavaridge fw13 glossy display
-      monitor=desc:LG Electronics LG ULTRAWIDE 311NTAB5M720,preferred,auto,1.25,vrr,2 # mauville
-      monitor=desc:LG Display 0x0569,preferred,auto,1.2 # rustboro
-      monitor=desc:Samsung Display Corp. 0x4152,preferred,auto,2 # petalburg
-      monitor=desc:Guangxi Century Innovation Display Electronics Co. Ltd 27C1U-D 0000000000001,preferred,-2560x0,1.5 # workshop
+    monitor = desc:BOE 0x0BCA,preferred,auto,1.566667 # lavaridge fw13 matte display
+    monitor = desc:BOE 0x095F,preferred,auto,1.566667# lavaridge fw13 glossy display
+    monitor = desc:LG Electronics LG ULTRAWIDE 311NTAB5M720,preferred,auto,1.25,vrr,2 # mauville
+    monitor = desc:LG Display 0x0569,preferred,auto,1.2 # rustboro
+    monitor = desc:Samsung Display Corp. 0x4152,preferred,auto,2 # petalburg
+    monitor = desc:Guangxi Century Innovation Display Electronics Co. Ltd 27C1U-D 0000000000001,preferred,-2560x0,1.5 # workshop
 
-      # Use best settings for all other monitors.
-      monitor=,preferred,auto,auto
+    # Use best settings for all other monitors.
+    monitor=,preferred,auto,auto
 
-      # unscale XWayland apps
-      xwayland {
-        force_zero_scaling = true
-      }
+    # unscale XWayland apps
+    xwayland {
+      force_zero_scaling = true
+    }
 
-      # toolkit-specific scale
-      env = GDK_SCALE,1.5
+    # toolkit-specific scale
+    env = GDK_SCALE,1.5
 
-      # Some default env vars.
-      env = XCURSOR_SIZE,${cursor_size}
-      env = QT_QPA_PLATFORMTHEME,${qt_platform_theme}
+    # Some default env vars.
+    env = XCURSOR_SIZE,${cursor_size}
+    env = QT_QPA_PLATFORMTHEME,${qt_platform_theme}
 
-      # Execute necessary apps
-      exec-once = ${pkgs.hyprshade} auto
-      exec-once = ${wallpaperd}
-      exec-once = ${bar}
-      exec-once = ${notifyd}
-      exec-once = ${pkgs.wl-clipboard}/bin/wl-paste --type text --watch cliphist store
-      exec-once = ${pkgs.wl-clipboard}/bin/wl-paste --type image --watch cliphist store
+    # Execute necessary apps
+    exec-once = ${pkgs.hyprshade} auto
+    exec-once = ${wallpaperd}
+    exec-once = ${bar}
+    exec-once = ${notifyd}
+    exec-once = ${pkgs.wl-clipboard}/bin/wl-paste --type text --watch cliphist store
+    exec-once = ${pkgs.wl-clipboard}/bin/wl-paste --type image --watch cliphist store
 
-      # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
-      input {
-          kb_layout = us
-          follow_mouse = 1
-          sensitivity = 0 # -1.0 to 1.0, 0 means no modification.
-          touchpad {
-              clickfinger_behavior = true
-              drag_lock = true
-              middle_button_emulation = true
-              natural_scroll = yes
-              tap-to-click = true
-          }
-      }
+    # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
+    input {
+        kb_layout = us
+        follow_mouse = 1
+        sensitivity = 0 # -1.0 to 1.0, 0 means no modification.
+        touchpad {
+            clickfinger_behavior = true
+            drag_lock = true
+            middle_button_emulation = true
+            natural_scroll = yes
+            tap-to-click = true
+        }
+    }
 
-      gestures {
-          workspace_swipe = true
-      }
+    gestures {
+        workspace_swipe = true
+    }
 
-      general {
-          gaps_in = 5
-          gaps_out = 10
-          border_size = 2
-          col.active_border = rgba(${border_secondary}) rgba(${border_primary}) 45deg
-          col.inactive_border = rgba(${border_inactive})
+    general {
+        gaps_in = 5
+        gaps_out = 10
+        border_size = 2
+        col.active_border = rgba(${border_secondary}) rgba(${border_primary}) 45deg
+        col.inactive_border = rgba(${border_inactive})
 
-          layout = dwindle
+        layout = dwindle
 
-          allow_tearing = false
-      }
+        allow_tearing = false
+    }
 
-      decoration {
-          rounding = 10
-          blur {
-              enabled = true
-              size = 8
-              passes = 1
-          }
-          drop_shadow = yes
-          shadow_range = 4
-          shadow_render_power = 3
-          col.shadow = rgba(${drop_shadow})
+    decoration {
+        rounding = 10
+        blur {
+            enabled = true
+            size = 8
+            passes = 1
+        }
+        drop_shadow = yes
+        shadow_range = 4
+        shadow_render_power = 3
+        col.shadow = rgba(${drop_shadow})
 
-          dim_special = 0.5
+        dim_special = 0.5
 
-          # Window-specific rules
-          layerrule = blur, waybar
-          layerrule = ignorezero, waybar
-          layerrule = blur, launcher
-          layerrule = blur, notifications
-          layerrule = ignorezero, notifications
-          layerrule = blur, logout_dialog
-      }
+        # Window-specific rules
+        layerrule = blur, waybar
+        layerrule = ignorezero, waybar
+        layerrule = blur, launcher
+        layerrule = blur, notifications
+        layerrule = ignorezero, notifications
+        layerrule = blur, logout_dialog
+    }
 
-      animations {
-          enabled = yes
-          bezier = myBezier, 0.05, 0.9, 0.1, 1.05
+    animations {
+        enabled = yes
+        bezier = myBezier, 0.05, 0.9, 0.1, 1.05
 
-          animation = windows, 1, 7, myBezier
-          animation = windowsOut, 1, 7, default, popin 80%
-          animation = border, 1, 10, default
-          animation = borderangle, 1, 8, default
-          animation = fade, 1, 7, default
-          animation = workspaces, 1, 6, default
-          animation = specialWorkspace, 1, 6, default, slidevert
-      }
+        animation = border, 1, 10, default
+        animation = borderangle, 1, 8, default
+        animation = fade, 1, 7, default
+        animation = specialWorkspace, 1, 6, default, slidevert
+        animation = windows, 1, 7, myBezier
+        animation = windowsOut, 1, 7, default, popin 80%
+        animation = workspaces, 1, 6, default
+    }
 
-      dwindle {
-          pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
-          preserve_split = yes # you probably want this
-      }
+    dwindle {
+        preserve_split = yes # you probably want this
+        pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
+    }
 
-      master {
-          new_is_master = false
-          always_center_master = true
-      }
+    master {
+        always_center_master = true
+        new_is_master = false
+    }
 
-      misc {
-          disable_splash_rendering = true
-          disable_hyprland_logo = true
-          vfr = true
-          focus_on_activate = true
-      }
+    misc {
+        disable_hyprland_logo = true
+        disable_splash_rendering = true
+        focus_on_activate = true
+        vfr = true
+    }
 
-      windowrulev2 = suppressevent maximize, class:.* # You'll probably like this.
+    # Window Rules
+    windowrulev2 = center(1),class:(blueberry.py)
+    windowrulev2 = center(1),class:(nmtui)
+    windowrulev2 = center(1),class:(pavucontrol)
+    windowrulev2 = float,class:(blueberry.py)
+    windowrulev2 = float,class:(nmtui)
+    windowrulev2 = float,class:(pavucontrol)
+    windowrulev2 = suppressevent maximize, class:.*
 
-      # PavuControl, nmtui, and blueberry float.
-      windowrulev2 = float,class:(pavucontrol)
-      windowrulev2 = center(1),class:(pavucontrol)
-      windowrulev2 = float,class:(nmtui)
-      windowrulev2 = center(1),class:(nmtui)
-      windowrulev2 = float,class:(blueberry.py)
-      windowrulev2 = center(1),class:(blueberry.py)
+    # See https://wiki.hyprland.org/Configuring/Keywords/ for more
+    $mainMod = ${modifier}
 
-      # See https://wiki.hyprland.org/Configuring/Keywords/ for more
-      $mainMod = ${modifier}
+    # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
+    bind = $mainMod, T, exec, ${terminal}
+    bind = $mainMod, F, exec, ${fileManager}
+    bind = $mainMod, B, exec, ${browser}
+    bind = $mainMod, E, exec, ${editor}
 
-      # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-      bind = $mainMod, T, exec, ${terminal}
-      bind = $mainMod, F, exec, ${fileManager}
-      bind = $mainMod, B, exec, ${browser}
-      bind = $mainMod, E, exec, ${editor}
+    bind = $mainMod, R, exec, ${launcher}
 
-      bind = $mainMod, R, exec, ${launcher}
+    # Manage session.
+    bind = $mainMod, C, killactive, 
+    bind = $mainMod, M, exec, ${logout}
+    bind = $mainMod, L, exec, ${lock}
 
-      # Manage session.
-      bind = $mainMod, C, killactive, 
-      bind = $mainMod, M, exec, ${logout}
-      bind = $mainMod, L, exec, ${lock}
+    # Basic window management.
+    bind = $mainMod SHIFT, W, fullscreen
+    bind = $mainMod SHIFT, V, togglefloating, 
+    bind = $mainMod SHIFT, P, pseudo, # dwindle
+    bind = $mainMod SHIFT, J, togglesplit, # dwindle
 
-      # Basic window management.
-      bind = $mainMod SHIFT, W, fullscreen
-      bind = $mainMod SHIFT, V, togglefloating, 
-      bind = $mainMod SHIFT, P, pseudo, # dwindle
-      bind = $mainMod SHIFT, J, togglesplit, # dwindle
+    # Move focus with mainMod + arrow keys
+    bind = $mainMod, left, movefocus, l
+    bind = $mainMod, right, movefocus, r
+    bind = $mainMod, up, movefocus, u
+    bind = $mainMod, down, movefocus, d
 
-      # Move focus with mainMod + arrow keys
-      bind = $mainMod, left, movefocus, l
-      bind = $mainMod, right, movefocus, r
-      bind = $mainMod, up, movefocus, u
-      bind = $mainMod, down, movefocus, d
+    # Gnome-like workspaces.
+    bind = $mainMod, 1, exec, ${hyprnome} --previous
+    bind = $mainMod, 2, exec, ${hyprnome}
+    bind = $mainMod SHIFT, 1, exec, ${hyprnome} --previous --move
+    bind = $mainMod SHIFT, 2, exec, ${hyprnome} --move
 
-      # Gnome-like workspaces.
-      bind = $mainMod, 1, exec, ${hyprnome} --previous
-      bind = $mainMod, 2, exec, ${hyprnome}
-      bind = $mainMod SHIFT, 1, exec, ${hyprnome} --previous --move
-      bind = $mainMod SHIFT, 2, exec, ${hyprnome} --move
+    # # Switch workspaces with mainMod + [0-9]
+    # bind = $mainMod, 1, workspace, 1
+    # bind = $mainMod, 2, workspace, 2
+    # bind = $mainMod, 3, workspace, 3
+    # bind = $mainMod, 4, workspace, 4
+    # bind = $mainMod, 5, workspace, 5
+    # bind = $mainMod, 6, workspace, 6
+    # bind = $mainMod, 7, workspace, 7
+    # bind = $mainMod, 8, workspace, 8
+    # bind = $mainMod, 9, workspace, 9
+    # bind = $mainMod, 0, workspace, 10
 
-      # # Switch workspaces with mainMod + [0-9]
-      # bind = $mainMod, 1, workspace, 1
-      # bind = $mainMod, 2, workspace, 2
-      # bind = $mainMod, 3, workspace, 3
-      # bind = $mainMod, 4, workspace, 4
-      # bind = $mainMod, 5, workspace, 5
-      # bind = $mainMod, 6, workspace, 6
-      # bind = $mainMod, 7, workspace, 7
-      # bind = $mainMod, 8, workspace, 8
-      # bind = $mainMod, 9, workspace, 9
-      # bind = $mainMod, 0, workspace, 10
+    # # Move active window to a workspace with mainMod + SHIFT + [0-9]
+    # bind = $mainMod SHIFT, 1, movetoworkspace, 1
+    # bind = $mainMod SHIFT, 2, movetoworkspace, 2
+    # bind = $mainMod SHIFT, 3, movetoworkspace, 3
+    # bind = $mainMod SHIFT, 4, movetoworkspace, 4
+    # bind = $mainMod SHIFT, 5, movetoworkspace, 5
+    # bind = $mainMod SHIFT, 6, movetoworkspace, 6
+    # bind = $mainMod SHIFT, 7, movetoworkspace, 7
+    # bind = $mainMod SHIFT, 8, movetoworkspace, 8
+    # bind = $mainMod SHIFT, 9, movetoworkspace, 9
+    # bind = $mainMod SHIFT, 0, movetoworkspace, 10
 
-      # # Move active window to a workspace with mainMod + SHIFT + [0-9]
-      # bind = $mainMod SHIFT, 1, movetoworkspace, 1
-      # bind = $mainMod SHIFT, 2, movetoworkspace, 2
-      # bind = $mainMod SHIFT, 3, movetoworkspace, 3
-      # bind = $mainMod SHIFT, 4, movetoworkspace, 4
-      # bind = $mainMod SHIFT, 5, movetoworkspace, 5
-      # bind = $mainMod SHIFT, 6, movetoworkspace, 6
-      # bind = $mainMod SHIFT, 7, movetoworkspace, 7
-      # bind = $mainMod SHIFT, 8, movetoworkspace, 8
-      # bind = $mainMod SHIFT, 9, movetoworkspace, 9
-      # bind = $mainMod SHIFT, 0, movetoworkspace, 10
+    # Example special workspace (scratchpad)
+    bind = $mainMod, S, togglespecialworkspace, magic
+    bind = $mainMod SHIFT, S, movetoworkspace, special:magic
 
-      # Example special workspace (scratchpad)
-      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
 
-      # 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, mouse:272, movewindow
+    bindm = $mainMod, mouse:273, resizewindow
 
-      # Move/resize windows with mainMod + LMB/RMB and dragging
-      bindm = $mainMod, mouse:272, movewindow
-      bindm = $mainMod, mouse:273, resizewindow
+    # Adjust display brightness.
+    bindle = , xf86monbrightnessup, exec, ${brightness_up}
+    bindle = , xf86monbrightnessdown, exec, ${brightness_down}
 
-      # Adjust display brightness.
-      bindle = , xf86monbrightnessup, exec, ${brightness_up}
-      bindle = , xf86monbrightnessdown, exec, ${brightness_down}
+    # Adjust volume and play/pause.
+    bindle = , xf86audioraisevolume, exec, ${volume_up};
+    bindle = , xf86audiolowervolume, exec, ${volume_down};
+    bindl = , xf86audiomute, exec, ${volume_mute}
+    bindl = , xf86audioplay, exec, ${media_play}
+    bindl = , xf86audioprev, exec, ${media_previous}
+    bindl = , xf86audionext, exec, ${media_next}
 
-      # Adjust volume and play/pause.
-      bindle = , xf86audioraisevolume, exec, ${volume_up};
-      bindle = , xf86audiolowervolume, exec, ${volume_down};
-      bindl = , xf86audiomute, exec, ${mute}
-      bindl = , xf86audioplay, exec, ${media_play}
-      bindl = , xf86audioprev, exec, ${media_previous}
-      bindl = , xf86audionext, exec, ${media_next}
+    # Extra bindings for petalburg.
+    bind = , xf86launch4, exec, pp-adjuster
+    # bind = ,xf86launch1, exec, cs-adjuster
+    bind = , xf86launch2, exec, ${media_play}
 
-      # Extra bindings for petalburg.
-      bind = , xf86launch4, exec, pp-adjuster
-      # bind = ,xf86launch1, exec, cs-adjuster
-      bind = , xf86launch2, exec, ${media_play}
+    # Screenshot with hyprshot.
+    bind = , PRINT, exec, ${screenshot_screen}
 
-      # Screenshot with hyprshot.
-      bind = , PRINT, exec, ${screenshot_screen}
-
-      # Show/hide waybar.
-      bind = $mainMod, F11, exec, pkill -SIGUSR1 waybar
+    # Show/hide waybar.
+    bind = $mainMod, F11, exec, pkill -SIGUSR1 waybar
     '';
 
   };