diff --git a/config/users/kat/sway/default.nix b/config/users/kat/sway/default.nix
index d6e7df1b..538fd7fa 100644
--- a/config/users/kat/sway/default.nix
+++ b/config/users/kat/sway/default.nix
@@ -2,6 +2,7 @@
 
 {
   imports = [
+    ./xkb.nix
     ./waybar.nix
     ./wofi.nix
     ./mako.nix
diff --git a/config/users/kat/sway/sway.nix b/config/users/kat/sway/sway.nix
index 5fab0a1a..8b9a41bc 100644
--- a/config/users/kat/sway/sway.nix
+++ b/config/users/kat/sway/sway.nix
@@ -1,97 +1,44 @@
 { config, pkgs, lib, witch, ... }:
 
 let
-  base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}")
-  config.lib.arc.base16.schemeForAlias.default;
   footwrap = pkgs.writeShellScriptBin "footwrap" ''
     exec foot "$2"
   '';
   lockCommand = "${pkgs.swaylock-fancy}/bin/swaylock-fancy -d -t ''";
-in
-  {
-    home.sessionVariables = {
-      XDG_CURRENT_DESKTOP = "sway";
-      XDG_SESSION_TYPE = "wayland";
-      WLR_DRM_DEVICES="/dev/dri/card0";
+in {
+  home.sessionVariables = {
+    XDG_CURRENT_DESKTOP = "sway";
+    XDG_SESSION_TYPE = "wayland";
+    WLR_DRM_DEVICES="/dev/dri/card0";
+  };
+
+  home.packages = with pkgs; [ grim slurp swaylock-fancy wl-clipboard jq quintom-cursor-theme gsettings-desktop-schemas glib wofi wmctrl ];
+
+  services.i3gopher = { enable = true; };
+
+
+  systemd.user.services.swayidle = {
+    Unit = {
+      Description = "swayidle";
+      Documentation = [ "man:swayidle(1)" ];
+      PartOf = [ "graphical-session.target" ];
     };
-
-    home.file = {
-      ".xkb/symbols/us_gbp_map".text = ''
-        default partial alphanumeric_keys
-        xkb_symbols "basic" {
-        include "us(altgr-intl)"
-        name[Group1] = "English (US, international with pound sign)";
-        key <AD03> { [ e, E, EuroSign, cent ] };
-        key <AE03> { [ 3, numbersign, sterling] };
-        };
-      '';
-    };
-
-    xdg.configFile."wofi/wofi.css".text = ''
-    #scroll, #input {
-      background: ${base16.base01};
-      }
-
-      window {
-      font-family: ${config.kw.font.name};
-      background: ${lib.hextorgba base16.base00 0.75};
-      border-radius: 1em;
-      font-size: ${config.kw.font.size_css};
-      color: ${base16.base07};
-      }
-
-    #outer-box {
-      margin: 1em;
-      }
-
-    #scroll {
-      border: 1px solid ${base16.base03};
-      }
-
-    #input {
-      border: 1px solid ${base16.base0C};
-      margin: 1em;
-      background: ${base16.base02};
-      color: ${base16.base04};
-      }
-
-    #entry {
-      border-bottom: 1px dashed ${base16.base04};
-      padding: .75em;
-      }
-
-    #entry:selected {
-      background-color: ${base16.base0D};
-      }
-    '';
-
-    home.packages = with pkgs; [ grim slurp swaylock-fancy wl-clipboard jq quintom-cursor-theme gsettings-desktop-schemas glib wofi wmctrl ];
-
-    services.i3gopher = { enable = true; };
-
-
-    systemd.user.services.swayidle = {
-      Unit = {
-        Description = "swayidle";
-        Documentation = [ "man:swayidle(1)" ];
-        PartOf = [ "graphical-session.target" ];
-      };
-      Service = {
-        Type = "simple";
-        ExecStart = ''
+    Service = {
+      Type = "simple";
+      ExecStart = ''
           ${pkgs.swayidle}/bin/swayidle -w \
           timeout 300 '${lockCommand} \
           timeout 600 'swaymsg "output * dpms off"' \
             resume 'swaymsg "output * dpms on"' \
           before-sleep '${lockCommand}'
-        '';
-        RestartSec = 3;
-        Restart = "always";
-      };
-      Install = { WantedBy = [ "sway-session.target" ]; };
+      '';
+      RestartSec = 3;
+      Restart = "always";
     };
+    Install = { WantedBy = [ "sway-session.target" ]; };
+  };
 
-    programs.zsh.profileExtra = ''
+  programs.zsh.profileExtra = ''
     # If running from tty1 start sway
       if [ "$(tty)" = "/dev/tty1" ]; then
       systemctl --user unset-environment \
@@ -106,127 +53,121 @@ in
         SHLVL
       exec env --unset=SHLVL systemd-cat -t sway -- sway
       fi
-    '';
+  '';
 
-    wayland.windowManager.sway =
-      let
-        cfg = config.wayland.windowManager.sway.config;
-        bindsym = k: v: "bindsym ${k} ${v}";
-        bindWorkspace = key: workspace: {
-          "${cfg.modifier}+${key}" = "workspace number ${workspace}";
-          "${cfg.modifier}+shift+${key}" =
-            "move container to workspace number ${workspace}";
+  wayland.windowManager.sway = let
+    cfg = config.wayland.windowManager.sway.config;
+    bindsym = k: v: "bindsym ${k} ${v}";
+    bindWorkspace = key: workspace: {
+      "${cfg.modifier}+${key}" = "workspace number ${workspace}";
+      "${cfg.modifier}+shift+${key}" = "move container to workspace number ${workspace}";
+    };
+    workspaceBindings = map (v: bindWorkspace v "${v}:${v}") [
+      "1"
+      "2"
+      "3"
+      "4"
+      "5"
+      "6"
+      "7"
+      "8"
+      "9"
+    ]
+    ++ [ (bindWorkspace "0" "10:10") ]
+    ++ lib.imap1 (i: v: bindWorkspace v "${toString (10 + i)}:${v}") [
+      "F1"
+      "F2"
+      "F3"
+      "F4"
+      "F5"
+      "F6"
+      "F7"
+      "F8"
+      "F9"
+      "F10"
+      "F11"
+      "F12"
+    ];
+    workspaceBindings' = map (lib.mapAttrsToList bindsym) workspaceBindings;
+    workspaceBindingsStr = lib.concatStringsSep "\n" (lib.flatten workspaceBindings');
+  in {
+    enable = true;
+    config = let
+      pactl = "${config.home.nixosConfig.hardware.pulseaudio.package or pkgs.pulseaudio}/bin/pactl";
+      dmenu = "${pkgs.wofi}/bin/wofi -idbt ${footwrap}/bin/footwrap -s ~/.config/wofi/wofi.css -p '' -W 25%";
+    in {
+
+      modes = {
+        "System (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (Shift+s) shutdown" =
+          {
+            "l" = "exec ${lockCommand}, mode default";
+            "e" = "exec swaymsg exit, mode default";
+            "s" = "exec systemctl suspend, mode default";
+            "h" = "exec systemctl hibernate, mode default";
+            "r" = "exec systemctl reboot, mode default";
+            "Shift+s" = "exec systemctl shutdown, mode default";
+            "Return" = "mode default";
+            "Escape" = "mode default";
           };
-          workspaceBindings = map (v: bindWorkspace v "${v}:${v}") [
-            "1"
-            "2"
-            "3"
-            "4"
-            "5"
-            "6"
-            "7"
-            "8"
-            "9"
-          ] ++ [ (bindWorkspace "0" "10:10") ]
-          ++ lib.imap1 (i: v: bindWorkspace v "${toString (10 + i)}:${v}") [
-          "F1"
-          "F2"
-          "F3"
-          "F4"
-          "F5"
-          "F6"
-          "F7"
-          "F8"
-          "F9"
-          "F10"
-          "F11"
-          "F12"
-          ];
-          workspaceBindings' = map (lib.mapAttrsToList bindsym) workspaceBindings;
-          workspaceBindingsStr =
-          lib.concatStringsSep "\n" (lib.flatten workspaceBindings');
-          in
-          {
-          enable = true;
-          config =
-          let
-          pactl = "${config.home.nixosConfig.hardware.pulseaudio.package or pkgs.pulseaudio}/bin/pactl";
-          dmenu = "${pkgs.wofi}/bin/wofi -idbt ${footwrap}/bin/footwrap -s ~/.config/wofi/wofi.css -p '' -W 25%";
-          in
-          {
-
-          modes = {
-          "System (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (Shift+s) shutdown" =
-          {
-          "l" = "exec ${lockCommand}, mode default";
-          "e" = "exec swaymsg exit, mode default";
-          "s" = "exec systemctl suspend, mode default";
-          "h" = "exec systemctl hibernate, mode default";
-          "r" = "exec systemctl reboot, mode default";
-          "Shift+s" = "exec systemctl shutdown, mode default";
-          "Return" = "mode default";
-          "Escape" = "mode default";
         };
-      };
-      bars = [{ command = "${pkgs.waybar}/bin/waybar"; }];
+        bars = [{ command = "${pkgs.waybar}/bin/waybar"; }];
 
-      input = {
-        "*" = {
-        xkb_layout = "us_gbp_map";
-        xkb_options = "compose:rctrl,ctrl:nocaps";
-        };
+        input = {
+          "*" = {
+            xkb_layout = "us_gbp_map";
+            xkb_options = "compose:rctrl,ctrl:nocaps";
+          };
         };
         fonts = {
-        names = [ config.kw.font.name ];
-        style = "Medium";
-        size = config.kw.font.size;
+          names = [ config.kw.font.name ];
+          style = "Medium";
+          size = config.kw.font.size;
         };
         terminal = "${pkgs.foot}/bin/foot";
-        menu =
-        "${pkgs.j4-dmenu-desktop}/bin/j4-dmenu-desktop --no-generic --dmenu=\"${dmenu}\" --term='${footwrap}/bin/footwrap'";
+        menu = "${pkgs.j4-dmenu-desktop}/bin/j4-dmenu-desktop --no-generic --dmenu=\"${dmenu}\" --term='${footwrap}/bin/footwrap'";
         modifier = "Mod4";
 
         assigns = { "12:F2" = [{ class = "screenstub"; }]; };
         startup = [
           {
             command = "gsettings set org.gnome.desktop.interface cursor-theme 'Quintom_Snow'";
-            }
-            {
+          }
+          {
             command = "systemctl --user restart mako";
             always = true;
-            }
-            {
+          }
+          {
             command = "systemctl --user restart konawall.service";
             always = true;
-            }
-            ];
+          }
+        ];
 
-            modes.resize = {
-            "a" = "resize shrink width 4 px or 4 ppt";
-            "s" = "resize shrink height 4 px or 4 ppt";
-            "w" = "resize grow height 4 px or 4 ppt";
-            "d" = "resize grow width 4 px or 4 ppt";
-            "Left" = "resize shrink width 4 px or 4 ppt";
-            "Down" = "resize shrink height 4 px or 4 ppt";
-            "Up" = "resize grow height 4 px or 4 ppt";
-            "Right" = "resize grow width 4 px or 4 ppt";
-            Return = ''mode "default"'';
-            Escape = ''mode "default"'';
-            "${cfg.modifier}+z" = ''mode "default"'';
-            };
-            window = {
-            border = 1;
-            titlebar = false;
-            };
+        modes.resize = {
+          "a" = "resize shrink width 4 px or 4 ppt";
+          "s" = "resize shrink height 4 px or 4 ppt";
+          "w" = "resize grow height 4 px or 4 ppt";
+          "d" = "resize grow width 4 px or 4 ppt";
+          "Left" = "resize shrink width 4 px or 4 ppt";
+          "Down" = "resize shrink height 4 px or 4 ppt";
+          "Up" = "resize grow height 4 px or 4 ppt";
+          "Right" = "resize grow width 4 px or 4 ppt";
+          Return = ''mode "default"'';
+          Escape = ''mode "default"'';
+          "${cfg.modifier}+z" = ''mode "default"'';
+          };
+          window = {
+          border = 1;
+          titlebar = false;
+          };
 
-            floating = {
-            border = 1;
-            titlebar = false;
-            };
+          floating = {
+          border = 1;
+          titlebar = false;
+          };
 
-            keybindings = {
-            "${cfg.modifier}+Return" = "exec ${cfg.terminal}";
-            "${cfg.modifier}+x" = "exec ${lockCommand}";
+          keybindings = {
+          "${cfg.modifier}+Return" = "exec ${cfg.terminal}";
+          "${cfg.modifier}+x" = "exec ${lockCommand}";
 
             # focus windows - regular
             "${cfg.modifier}+Left" = "focus left";
@@ -312,23 +253,16 @@ in
             "${cfg.modifier}+r" = "exec ${cfg.menu}";
 
             # screenshots - upload
-            "${cfg.modifier}+Print" =
-            "exec ${pkgs.sway-scrot}/bin/sway-scrot --notify upload screen";
-            "${cfg.modifier}+Shift+Print" =
-            "exec ${pkgs.sway-scrot}/bin/sway-scrot  --notify upload area";
-            "${cfg.modifier}+Mod1+Print" =
-            "exec ${pkgs.sway-scrot}/bin/sway-scrot --notify upload window";
-            "${cfg.modifier}+Control+Print" =
-            "exec ${pkgs.sway-scrot}/bin/sway-scrot --notify upload output";
+            "${cfg.modifier}+Print" = "exec ${pkgs.sway-scrot}/bin/sway-scrot --notify upload screen";
+            "${cfg.modifier}+Shift+Print" = "exec ${pkgs.sway-scrot}/bin/sway-scrot  --notify upload area";
+            "${cfg.modifier}+Mod1+Print" = "exec ${pkgs.sway-scrot}/bin/sway-scrot --notify upload window";
+            "${cfg.modifier}+Control+Print" = "exec ${pkgs.sway-scrot}/bin/sway-scrot --notify upload output";
 
             # screenshots - clipboard
             "Print" = "exec ${pkgs.sway-scrot}/bin/sway-scrot --notify copys screen";
-            "Shift+Print" =
-              "exec ${pkgs.sway-scrot}/bin/sway-scrot  --notify copys area";
-              "Mod1+Print" =
-                "exec ${pkgs.sway-scrot}/bin/sway-scrot --notify copys window";
-                "Control+Print" =
-                  "exec ${pkgs.sway-scrot}/bin/sway-scrot --notify copys output";
+            "Shift+Print" = "exec ${pkgs.sway-scrot}/bin/sway-scrot  --notify copys area";
+            "Mod1+Print" = "exec ${pkgs.sway-scrot}/bin/sway-scrot --notify copys window";
+            "Control+Print" = "exec ${pkgs.sway-scrot}/bin/sway-scrot --notify copys output";
 
             # layout handling
             "${cfg.modifier}+b" = "splith";
@@ -344,87 +278,85 @@ in
 
             # mode triggers
             "${cfg.modifier}+Shift+r" = "mode resize";
-            "${cfg.modifier}+Delete" = ''
-                    mode "System (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (Shift+s) shutdown"'';
-                  };
+            "${cfg.modifier}+Delete" = ''mode "System (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (Shift+s) shutdown"'';
+            };
 
-                  colors = {
-                    focused = {
-                      border = base16.base01;
-                      background = base16.base0D;
-                      text = base16.base07;
-                      indicator = base16.base0D;
-                      childBorder = base16.base0D;
-                    };
-                    focusedInactive = {
-                      border = base16.base02;
-                      background = base16.base04;
-                      text = base16.base00;
-                      indicator = base16.base04;
-                      childBorder = base16.base04;
-                    };
-                    unfocused = {
-                      border = base16.base01;
-                      background = base16.base02;
-                      text = base16.base06;
-                      indicator = base16.base02;
-                      childBorder = base16.base02;
-                    };
-                    urgent = {
-                      border = base16.base03;
-                      background = base16.base08;
-                      text = base16.base00;
-                      indicator = base16.base08;
-                      childBorder = base16.base08;
-                    };
-                  };
-                };
-                wrapperFeatures.gtk = true;
-                extraConfig = ''
-                      hide_edge_borders smart_no_gaps
-                      smart_borders no_gaps
-                      title_align center
-                      seat seat0 xcursor_theme Quintom_Snow 20
-                      workspace_auto_back_and_forth yes
-                      set $mode_gaps Gaps: (o) outer, (i) inner
-                      set $mode_gaps_outer Outer Gaps: +|-|0 (local), Shift + +|-|0 (global)
-                      set $mode_gaps_inner Inner Gaps: +|-|0 (local), Shift + +|-|0 (global)
-                      bindsym ${cfg.modifier}+Shift+g mode "$mode_gaps"
-
-                      mode "$mode_gaps" {
-                        bindsym o      mode "$mode_gaps_outer"
-                        bindsym i      mode "$mode_gaps_inner"
-                        bindsym Return mode "default"
-                        bindsym Escape mode "default"
-                      }
-
-                      mode "$mode_gaps_inner" {
-                        bindsym equal  gaps inner current plus 5
-                        bindsym minus gaps inner current minus 5
-                        bindsym 0     gaps inner current set 0
-
-                        bindsym plus  gaps inner all plus 5
-                        bindsym Shift+minus gaps inner all minus 5
-                        bindsym Shift+0     gaps inner all set 0
-
-                        bindsym Return mode "default"
-                        bindsym Escape mode "default"
-                      }
-
-                      mode "$mode_gaps_outer" {
-                        bindsym equal  gaps outer current plus 5
-                        bindsym minus gaps outer current minus 5
-                        bindsym 0     gaps outer current set 0
-
-                        bindsym plus  gaps outer all plus 5
-                        bindsym Shift+minus gaps outer all minus 5
-                        bindsym Shift+0     gaps outer all set 0
-
-                        bindsym Return mode "default"
-                        bindsym Escape mode "default"
-                      }
-                      ${workspaceBindingsStr}
-                '';
-              };
+            colors = let base16 = config.kw.hexColors; in {
+            focused = {
+            border = base16.base01;
+            background = base16.base0D;
+            text = base16.base07;
+            indicator = base16.base0D;
+            childBorder = base16.base0D;
+            };
+            focusedInactive = {
+            border = base16.base02;
+            background = base16.base04;
+            text = base16.base00;
+            indicator = base16.base04;
+            childBorder = base16.base04;
+            };
+            unfocused = {
+            border = base16.base01;
+            background = base16.base02;
+            text = base16.base06;
+            indicator = base16.base02;
+            childBorder = base16.base02;
+            };
+            urgent = {
+            border = base16.base03;
+            background = base16.base08;
+            text = base16.base00;
+            indicator = base16.base08;
+            childBorder = base16.base08;
+            };
+            };
+            };
+            wrapperFeatures.gtk = true;
+            extraConfig = ''
+            hide_edge_borders smart_no_gaps
+            smart_borders no_gaps
+            title_align center
+            seat seat0 xcursor_theme Quintom_Snow 20
+            workspace_auto_back_and_forth yes
+            set $mode_gaps Gaps: (o) outer, (i) inner
+            set $mode_gaps_outer Outer Gaps: +|-|0 (local), Shift + +|-|0 (global)
+            set $mode_gaps_inner Inner Gaps: +|-|0 (local), Shift + +|-|0 (global)
+            bindsym ${cfg.modifier}+Shift+g mode "$mode_gaps"
 
+            mode "$mode_gaps" {
+            bindsym o      mode "$mode_gaps_outer"
+            bindsym i      mode "$mode_gaps_inner"
+            bindsym Return mode "default"
+            bindsym Escape mode "default"
+            }
+
+            mode "$mode_gaps_inner" {
+            bindsym equal  gaps inner current plus 5
+            bindsym minus gaps inner current minus 5
+            bindsym 0     gaps inner current set 0
+
+            bindsym plus  gaps inner all plus 5
+            bindsym Shift+minus gaps inner all minus 5
+            bindsym Shift+0     gaps inner all set 0
+
+            bindsym Return mode "default"
+            bindsym Escape mode "default"
+            }
+
+            mode "$mode_gaps_outer" {
+            bindsym equal  gaps outer current plus 5
+            bindsym minus gaps outer current minus 5
+            bindsym 0     gaps outer current set 0
+
+            bindsym plus  gaps outer all plus 5
+            bindsym Shift+minus gaps outer all minus 5
+            bindsym Shift+0     gaps outer all set 0
+
+            bindsym Return mode "default"
+            bindsym Escape mode "default"
+            }
+            ${workspaceBindingsStr}
+            '';
+            };
             }
diff --git a/config/users/kat/sway/xkb.nix b/config/users/kat/sway/xkb.nix
new file mode 100644
index 00000000..195755ea
--- /dev/null
+++ b/config/users/kat/sway/xkb.nix
@@ -0,0 +1,15 @@
+{ config, ... }:
+
+{
+  home.file = {
+    ".xkb/symbols/us_gbp_map".text = ''
+      default partial alphanumeric_keys
+      xkb_symbols "basic" {
+      include "us(altgr-intl)"
+      name[Group1] = "English (US, international with pound sign)";
+      key <AD03> { [ e, E, EuroSign, cent ] };
+      key <AE03> { [ 3, numbersign, sterling] };
+      };
+    '';
+  };
+}