diff --git a/modules/graphical/i3.nix b/modules/graphical/i3.nix
index ff9891d..86a7157 100644
--- a/modules/graphical/i3.nix
+++ b/modules/graphical/i3.nix
@@ -7,7 +7,8 @@ let
   lockUpdate =
     "${pkgs.betterlockscreen}/bin/betterlockscreen --update ${config.gui.wallpaper} --display 1 --span";
 
-in {
+in
+{
 
   config = {
 
@@ -27,213 +28,223 @@ in {
       xsession.windowManager.i3 = {
         enable = config.services.xserver.enable;
         package = pkgs.i3-gaps;
-        config = let
-          modifier = "Mod4"; # Super key
-          ws1 = "1:I";
-          ws2 = "2:II";
-          ws3 = "3:III";
-          ws4 = "4:IV";
-          ws5 = "5:V";
-          ws6 = "6:VI";
-          ws7 = "7:VII";
-          ws8 = "8:VIII";
-          ws9 = "9:IX";
-          ws10 = "10:X";
-        in {
-          modifier = modifier;
-          assigns = {
-            "${ws1}" = [{ class = "Firefox"; }];
-            "${ws2}" = [{ class = "Alacritty"; }];
-            "${ws3}" = [{ class = "discord"; }];
-            "${ws4}" = [{ class = "Steam"; }];
-          };
-          bars = [{ command = "echo"; }]; # Disable i3bar
-          colors = let
-            background = config.colorscheme.base00;
-            inactiveBackground = config.colorscheme.base01;
-            border = config.colorscheme.base01;
-            inactiveBorder = config.colorscheme.base01;
-            text = config.colorscheme.base07;
-            inactiveText = config.colorscheme.base04;
-            urgentBackground = config.colorscheme.base08;
-            indicator = "#00000000";
-          in {
-            background = config.colorscheme.base00;
-            focused = {
-              inherit background indicator text border;
-              childBorder = background;
+        config =
+          let
+            modifier = "Mod4"; # Super key
+            ws1 = "1:I";
+            ws2 = "2:II";
+            ws3 = "3:III";
+            ws4 = "4:IV";
+            ws5 = "5:V";
+            ws6 = "6:VI";
+            ws7 = "7:VII";
+            ws8 = "8:VIII";
+            ws9 = "9:IX";
+            ws10 = "10:X";
+          in
+          {
+            modifier = modifier;
+            assigns = {
+              "${ws1}" = [{ class = "Firefox"; }];
+              "${ws2}" = [{ class = "kitty"; }];
+              "${ws3}" = [{ class = "discord"; }];
+              "${ws4}" = [{ class = "Steam"; }];
             };
-            focusedInactive = {
-              inherit indicator;
-              background = inactiveBackground;
-              border = inactiveBorder;
-              childBorder = inactiveBackground;
-              text = inactiveText;
+            bars = [{ command = "echo"; }]; # Disable i3bar
+            colors =
+              let
+                background = config.colorscheme.base00;
+                inactiveBackground = config.colorscheme.base01;
+                border = config.colorscheme.base01;
+                inactiveBorder = config.colorscheme.base01;
+                text = config.colorscheme.base07;
+                inactiveText = config.colorscheme.base04;
+                urgentBackground = config.colorscheme.base08;
+                indicator = "#00000000";
+              in
+              {
+                background = config.colorscheme.base00;
+                focused = {
+                  inherit background indicator text border;
+                  childBorder = background;
+                };
+                focusedInactive = {
+                  inherit indicator;
+                  background = inactiveBackground;
+                  border = inactiveBorder;
+                  childBorder = inactiveBackground;
+                  text = inactiveText;
+                };
+                # placeholder = { };
+                unfocused = {
+                  inherit indicator;
+                  background = inactiveBackground;
+                  border = inactiveBorder;
+                  childBorder = inactiveBackground;
+                  text = inactiveText;
+                };
+                urgent = {
+                  inherit text indicator;
+                  background = urgentBackground;
+                  border = urgentBackground;
+                  childBorder = urgentBackground;
+                };
+              };
+            floating.modifier = modifier;
+            focus = {
+              mouseWarping = true;
+              newWindow = "urgent";
+              followMouse = false;
             };
-            # placeholder = { };
-            unfocused = {
-              inherit indicator;
-              background = inactiveBackground;
-              border = inactiveBorder;
-              childBorder = inactiveBackground;
-              text = inactiveText;
+            keybindings = {
+
+              # Adjust screen brightness
+              "Shift+F12" =
+                "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 + 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --display 2 setvcp 10 + 30";
+              "Shift+F11" =
+                "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 - 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --display 2 setvcp 10 - 30";
+              "XF86MonBrightnessUp" =
+                "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 + 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --display 2 setvcp 10 + 30";
+              "XF86MonBrightnessDown" =
+                "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 - 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --display 2 setvcp 10 - 30";
+
+              # Media player controls
+              "XF86AudioPlay" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
+              "XF86AudioStop" = "exec ${pkgs.playerctl}/bin/playerctl stop";
+              "XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next";
+              "XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
+
+              # Launchers
+              "${modifier}+Return" =
+                "exec --no-startup-id kitty; workspace ${ws2}; layout tabbed";
+              "${modifier}+space" =
+                "exec --no-startup-id ${config.gui.launcherCommand}";
+              "${modifier}+Shift+s" =
+                "exec --no-startup-id ${config.gui.systemdSearch}";
+              "Mod1+Tab" = "exec --no-startup-id ${config.gui.altTabCommand}";
+              "${modifier}+Shift+c" = "reload";
+              "${modifier}+Shift+r" = "restart";
+              "${modifier}+Shift+q" = ''
+                exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"'';
+              "${modifier}+Shift+x" = "exec ${lockCmd}";
+
+              # Window options
+              "${modifier}+q" = "kill";
+              "${modifier}+b" = "exec ${config.gui.toggleBarCommand}";
+              "${modifier}+f" = "fullscreen toggle";
+              "${modifier}+h" = "focus left";
+              "${modifier}+j" = "focus down";
+              "${modifier}+k" = "focus up";
+              "${modifier}+l" = "focus right";
+              "${modifier}+Left" = "focus left";
+              "${modifier}+Down" = "focus down";
+              "${modifier}+Up" = "focus up";
+              "${modifier}+Right" = "focus right";
+              "${modifier}+Shift+h" = "move left";
+              "${modifier}+Shift+j" = "move down";
+              "${modifier}+Shift+k" = "move up";
+              "${modifier}+Shift+l" = "move right";
+              "${modifier}+Shift+Left" = "move left";
+              "${modifier}+Shift+Down" = "move down";
+              "${modifier}+Shift+Up" = "move up";
+              "${modifier}+Shift+Right" = "move right";
+
+              # Tiling
+              "${modifier}+i" = "split h";
+              "${modifier}+v" = "split v";
+              "${modifier}+s" = "layout stacking";
+              "${modifier}+t" = "layout tabbed";
+              "${modifier}+e" = "layout toggle split";
+              "${modifier}+Shift+space" = "floating toggle";
+              "${modifier}+Control+space" = "focus mode_toggle";
+              "${modifier}+a" = "focus parent";
+
+              # Workspaces
+              "${modifier}+1" = "workspace ${ws1}";
+              "${modifier}+2" = "workspace ${ws2}";
+              "${modifier}+3" = "workspace ${ws3}";
+              "${modifier}+4" = "workspace ${ws4}";
+              "${modifier}+5" = "workspace ${ws5}";
+              "${modifier}+6" = "workspace ${ws6}";
+              "${modifier}+7" = "workspace ${ws7}";
+              "${modifier}+8" = "workspace ${ws8}";
+              "${modifier}+9" = "workspace ${ws9}";
+              "${modifier}+0" = "workspace ${ws10}";
+
+              # Move windows
+              "${modifier}+Shift+1" =
+                "move container to workspace ${ws1}; workspace ${ws1}";
+              "${modifier}+Shift+2" =
+                "move container to workspace ${ws2}; workspace ${ws2}";
+              "${modifier}+Shift+3" =
+                "move container to workspace ${ws3}; workspace ${ws3}";
+              "${modifier}+Shift+4" =
+                "move container to workspace ${ws4}; workspace ${ws4}";
+              "${modifier}+Shift+5" =
+                "move container to workspace ${ws5}; workspace ${ws5}";
+              "${modifier}+Shift+6" =
+                "move container to workspace ${ws6}; workspace ${ws6}";
+              "${modifier}+Shift+7" =
+                "move container to workspace ${ws7}; workspace ${ws7}";
+              "${modifier}+Shift+8" =
+                "move container to workspace ${ws8}; workspace ${ws8}";
+              "${modifier}+Shift+9" =
+                "move container to workspace ${ws9}; workspace ${ws9}";
+              "${modifier}+Shift+0" =
+                "move container to workspace ${ws10}; workspace ${ws10}";
+
+              # Move screens
+              "${modifier}+Control+l" = "move workspace to output right";
+              "${modifier}+Control+h" = "move workspace to output left";
+
+              # Resizing
+              "${modifier}+r" = ''mode "resize"'';
+              "${modifier}+Control+Shift+h" =
+                "resize shrink width 10 px or 10 ppt";
+              "${modifier}+Control+Shift+j" =
+                "resize grow height 10 px or 10 ppt";
+              "${modifier}+Control+Shift+k" =
+                "resize shrink height 10 px or 10 ppt";
+              "${modifier}+Control+Shift+l" = "resize grow width 10 px or 10 ppt";
             };
-            urgent = {
-              inherit text indicator;
-              background = urgentBackground;
-              border = urgentBackground;
-              childBorder = urgentBackground;
+            modes = { };
+            startup = [
+              {
+                command = "feh --bg-fill ${config.gui.wallpaper}";
+                always = true;
+                notification = false;
+              }
+              {
+                command =
+                  "i3-msg workspace ${ws2}, move workspace to output right";
+                notification = false;
+              }
+              {
+                command =
+                  "i3-msg workspace ${ws1}, move workspace to output left";
+                notification = false;
+              }
+            ];
+            window = {
+              border = 0;
+              hideEdgeBorders = "smart";
+              titlebar = false;
             };
+            workspaceAutoBackAndForth = false;
+            workspaceOutputAssign = [ ];
+            # gaps = {
+            # bottom = 8;
+            # top = 8;
+            # left = 8;
+            # right = 8;
+            # horizontal = 15;
+            # vertical = 15;
+            # inner = 15;
+            # outer = 0;
+            # smartBorders = "off";
+            # smartGaps = false;
+            # };
           };
-          floating.modifier = modifier;
-          focus = {
-            mouseWarping = true;
-            newWindow = "urgent";
-            followMouse = false;
-          };
-          keybindings = {
-
-            # Adjust screen brightness
-            "Shift+F12" =
-              "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 + 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --display 2 setvcp 10 + 30";
-            "Shift+F11" =
-              "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 - 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --display 2 setvcp 10 - 30";
-            "XF86MonBrightnessUp" =
-              "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 + 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --display 2 setvcp 10 + 30";
-            "XF86MonBrightnessDown" =
-              "exec ${pkgs.ddcutil}/bin/ddcutil --display 1 setvcp 10 - 30 && sleep 1; exec ${pkgs.ddcutil}/bin/ddcutil --display 2 setvcp 10 - 30";
-
-            # Media player controls
-            "XF86AudioPlay" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
-            "XF86AudioStop" = "exec ${pkgs.playerctl}/bin/playerctl stop";
-            "XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next";
-            "XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
-
-            # Launchers
-            "${modifier}+Return" =
-              "exec --no-startup-id alacritty; workspace ${ws2}; layout tabbed";
-            "${modifier}+space" =
-              "exec --no-startup-id ${config.gui.launcherCommand}";
-            "${modifier}+Shift+s" =
-              "exec --no-startup-id ${config.gui.systemdSearch}";
-            "Mod1+Tab" = "exec --no-startup-id ${config.gui.altTabCommand}";
-            "${modifier}+Shift+c" = "reload";
-            "${modifier}+Shift+r" = "restart";
-            "${modifier}+Shift+q" = ''
-              exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"'';
-            "${modifier}+Shift+x" = "exec ${lockCmd}";
-
-            # Window options
-            "${modifier}+q" = "kill";
-            "${modifier}+b" = "exec ${config.gui.toggleBarCommand}";
-            "${modifier}+f" = "fullscreen toggle";
-            "${modifier}+h" = "focus left";
-            "${modifier}+j" = "focus down";
-            "${modifier}+k" = "focus up";
-            "${modifier}+l" = "focus right";
-            "${modifier}+Left" = "focus left";
-            "${modifier}+Down" = "focus down";
-            "${modifier}+Up" = "focus up";
-            "${modifier}+Right" = "focus right";
-            "${modifier}+Shift+h" = "move left";
-            "${modifier}+Shift+j" = "move down";
-            "${modifier}+Shift+k" = "move up";
-            "${modifier}+Shift+l" = "move right";
-            "${modifier}+Shift+Left" = "move left";
-            "${modifier}+Shift+Down" = "move down";
-            "${modifier}+Shift+Up" = "move up";
-            "${modifier}+Shift+Right" = "move right";
-
-            # Tiling
-            "${modifier}+i" = "split h";
-            "${modifier}+v" = "split v";
-            "${modifier}+s" = "layout stacking";
-            "${modifier}+t" = "layout tabbed";
-            "${modifier}+e" = "layout toggle split";
-            "${modifier}+Shift+space" = "floating toggle";
-            "${modifier}+Control+space" = "focus mode_toggle";
-            "${modifier}+a" = "focus parent";
-
-            # Workspaces
-            "${modifier}+1" = "workspace ${ws1}";
-            "${modifier}+2" = "workspace ${ws2}";
-            "${modifier}+3" = "workspace ${ws3}";
-            "${modifier}+4" = "workspace ${ws4}";
-            "${modifier}+5" = "workspace ${ws5}";
-            "${modifier}+6" = "workspace ${ws6}";
-            "${modifier}+7" = "workspace ${ws7}";
-            "${modifier}+8" = "workspace ${ws8}";
-            "${modifier}+9" = "workspace ${ws9}";
-            "${modifier}+0" = "workspace ${ws10}";
-
-            # Move windows
-            "${modifier}+Shift+1" =
-              "move container to workspace ${ws1}; workspace ${ws1}";
-            "${modifier}+Shift+2" =
-              "move container to workspace ${ws2}; workspace ${ws2}";
-            "${modifier}+Shift+3" =
-              "move container to workspace ${ws3}; workspace ${ws3}";
-            "${modifier}+Shift+4" =
-              "move container to workspace ${ws4}; workspace ${ws4}";
-            "${modifier}+Shift+5" =
-              "move container to workspace ${ws5}; workspace ${ws5}";
-            "${modifier}+Shift+6" =
-              "move container to workspace ${ws6}; workspace ${ws6}";
-            "${modifier}+Shift+7" =
-              "move container to workspace ${ws7}; workspace ${ws7}";
-            "${modifier}+Shift+8" =
-              "move container to workspace ${ws8}; workspace ${ws8}";
-            "${modifier}+Shift+9" =
-              "move container to workspace ${ws9}; workspace ${ws9}";
-            "${modifier}+Shift+0" =
-              "move container to workspace ${ws10}; workspace ${ws10}";
-
-            # Move screens
-            "${modifier}+Control+l" = "move workspace to output right";
-            "${modifier}+Control+h" = "move workspace to output left";
-
-            # Resizing
-            "${modifier}+r" = ''mode "resize"'';
-            "${modifier}+Control+Shift+h" =
-              "resize shrink width 10 px or 10 ppt";
-            "${modifier}+Control+Shift+j" =
-              "resize grow height 10 px or 10 ppt";
-            "${modifier}+Control+Shift+k" =
-              "resize shrink height 10 px or 10 ppt";
-            "${modifier}+Control+Shift+l" = "resize grow width 10 px or 10 ppt";
-          };
-          modes = { };
-          startup = [
-            {
-              command = "feh --bg-fill ${config.gui.wallpaper}";
-              always = true;
-              notification = false;
-            }
-            {
-              command = "i3-msg workspace ${ws1}";
-              notification = false;
-            }
-          ];
-          window = {
-            border = 0;
-            hideEdgeBorders = "smart";
-            titlebar = false;
-          };
-          workspaceAutoBackAndForth = false;
-          workspaceOutputAssign = [ ];
-          # gaps = {
-          # bottom = 8;
-          # top = 8;
-          # left = 8;
-          # right = 8;
-          # horizontal = 15;
-          # vertical = 15;
-          # inner = 15;
-          # outer = 0;
-          # smartBorders = "off";
-          # smartGaps = false;
-          # };
-        };
         extraConfig = "";
       };
 
@@ -247,9 +258,10 @@ in {
       # Update lock screen cache only if cache is empty
       home.activation.updateLockScreenCache =
         let cacheDir = "${config.homePath}/.cache/betterlockscreen/current";
-        in lib.mkIf config.services.xserver.enable
-        (config.home-manager.users.${config.user}.lib.dag.entryAfter
-          [ "writeBoundary" ] ''
+        in
+        lib.mkIf config.services.xserver.enable
+          (config.home-manager.users.${config.user}.lib.dag.entryAfter
+            [ "writeBoundary" ] ''
             if [ ! -d ${cacheDir} ] || [ -z "$(ls ${cacheDir})" ]; then
                 $DRY_RUN_CMD ${lockUpdate}
             fi