diff --git a/config/hosts/beltane/home/sway.nix b/config/hosts/beltane/home/sway.nix
index 5cbc5016..4610c9b0 100644
--- a/config/hosts/beltane/home/sway.nix
+++ b/config/hosts/beltane/home/sway.nix
@@ -3,46 +3,16 @@
 with lib;
 
 {
-  imports = [ ./swayidle.nix ];
-
-  wayland.windowManager.sway = {
-    config =
+  wayland.windowManager.sway.config = {
+    output =
       let
-        lockCommand = "swaylock -i VGA-1:${builtins.elemAt config.kw.wallpapers 0} -s fill";
-        cfg = config.wayland.windowManager.sway.config;
+        middle = {
+          res = "1280x1024@75Hz";
+          pos = "1920 0";
+        };
       in
       {
-        #startup = [{ command = "${pkgs.ckb-next}/bin/ckb-next -b"; }];
-
-        output =
-          let
-            middle = {
-              res = "1280x1024@75Hz";
-              pos = "1920 0";
-            };
-          in
-          {
-            "VGA-1" = middle;
-          };
-
-        keybindings = {
-          "${cfg.modifier}+x" = "exec ${lockCommand}";
-        };
-
-        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";
-            };
-        };
-
-        };
+        "VGA-1" = middle;
       };
-}
+    };
+  }
diff --git a/config/hosts/beltane/home/swayidle.nix b/config/hosts/beltane/home/swayidle.nix
deleted file mode 100644
index 290a0aae..00000000
--- a/config/hosts/beltane/home/swayidle.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  systemd.user.services.swayidle = {
-    Unit = {
-      Description = "swayidle";
-      Documentation = [ "man:swayidle(1)" ];
-      PartOf = [ "graphical-session.target" ];
-    };
-    Service = {
-      Type = "simple";
-      ExecStart = ''
-        ${pkgs.swayidle}/bin/swayidle -w \
-          timeout 300 '${pkgs.swaylock}/bin/swaylock -f -i VGA-1:${builtins.elemAt config.kw.wallpapers 0} \
-          timeout 600 'swaymsg "output * dpms off"' \
-            resume 'swaymsg "output * dpms on"' \
-          before-sleep '${pkgs.swaylock}/bin/swaylock -f -i VGA-1:${builtins.elemAt config.kw.wallpapers 0}'
-      '';
-      RestartSec = 3;
-      Restart = "always";
-    };
-    Install = { WantedBy = [ "sway-session.target" ]; };
-  };
-}
diff --git a/config/hosts/samhain/home/sway.nix b/config/hosts/samhain/home/sway.nix
index c2d7aa33..b6a67121 100644
--- a/config/hosts/samhain/home/sway.nix
+++ b/config/hosts/samhain/home/sway.nix
@@ -3,81 +3,53 @@
 with lib;
 
 {
-  imports = [ ./swayidle.nix ];
-
   wayland.windowManager.sway = {
-    config =
-      let
-        lockCommand = "swaylock -i HDMI-A-1:${builtins.elemAt config.kw.wallpapers 0} -i DP-1:${builtins.elemAt config.kw.wallpapers 1}  -i DVI-D-1:${builtins.elemAt config.kw.wallpapers 2} -s fill";
-        cfg = config.wayland.windowManager.sway.config;
+    config = {
+      output = let
+        left = {
+          res = "1920x1080";
+          pos = "0 0";
+        };
+        middle = {
+          res = "1920x1200";
+          pos = "1920 0";
+        };
+        right = {
+          res = "1920x1080";
+          pos = "3840 0";
+        };
       in
       {
-        #startup = [{ command = "${pkgs.ckb-next}/bin/ckb-next -b"; }];
+        "DP-1" = right;
+        "DVI-D-1" = middle;
+        "HDMI-A-1" = left;
+      };
 
-        output =
-          let
-            left = {
-              res = "1920x1080";
-              pos = "0 0";
-            };
-            middle = {
-              res = "1920x1200";
-              pos = "1920 0";
-            };
-            right = {
-              res = "1920x1080";
-              pos = "3840 0";
-            };
-          in
-          {
-            "DP-1" = right;
-            "DVI-D-1" = middle;
-            "HDMI-A-1" = left;
-          };
-
-        keybindings = {
-          "${cfg.modifier}+x" = "exec ${lockCommand}";
+      input = {
+        "5426:103:Razer_Razer_Naga_Trinity" = {
+          accel_profile = "adaptive";
+          pointer_accel = "-0.5";
         };
-
-        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";
-            };
+        "5824:1503:screenstub-tablet" = { events = "disabled"; };
+        "5824:1503:screenstub-mouse" = { events = "disabled"; };
+        "5824:1503:screenstub-kbd" = { events = "disabled"; };
+        "1386:215:Wacom_BambooPT_2FG_Small_Pen" = {
+          map_to_output = "HDMI-A-1";
         };
-
-        input = {
-          "5426:103:Razer_Razer_Naga_Trinity" = {
-            accel_profile = "adaptive";
-            pointer_accel = "-0.5";
-          };
-          "5824:1503:screenstub-tablet" = { events = "disabled"; };
-          "5824:1503:screenstub-mouse" = { events = "disabled"; };
-          "5824:1503:screenstub-kbd" = { events = "disabled"; };
-          "1386:215:Wacom_BambooPT_2FG_Small_Pen" = {
-            map_to_output = "HDMI-A-1";
-          };
-          "1386:215:Wacom_BambooPT_2FG_Small_Finger" = {
-            natural_scroll = "enabled";
-            middle_emulation = "enabled";
-            tap = "enabled";
-            dwt = "enabled";
-            accel_profile = "flat";
-            pointer_accel = "0.05";
-          };
+        "1386:215:Wacom_BambooPT_2FG_Small_Finger" = {
+          natural_scroll = "enabled";
+          middle_emulation = "enabled";
+          tap = "enabled";
+          dwt = "enabled";
+          accel_profile = "flat";
+          pointer_accel = "0.05";
         };
       };
+    };
     extraConfig = ''
-      workspace "1" output "DP-1"
-      workspace "11:F1" output "DVI-1"
-      workspace "12:F2" output "HDMI-A-1"
+        workspace "1" output "DP-1"
+        workspace "11:F1" output "DVI-1"
+        workspace "12:F2" output "HDMI-A-1"
     '';
   };
 }
diff --git a/config/hosts/samhain/home/swayidle.nix b/config/hosts/samhain/home/swayidle.nix
deleted file mode 100644
index 34cb61f9..00000000
--- a/config/hosts/samhain/home/swayidle.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-{
-  systemd.user.services.swayidle = {
-    Unit = {
-      Description = "swayidle";
-      Documentation = [ "man:swayidle(1)" ];
-      PartOf = [ "graphical-session.target" ];
-    };
-    Service = {
-      Type = "simple";
-      ExecStart = ''
-        ${pkgs.swayidle}/bin/swayidle -w \
-          timeout 300 '${pkgs.swaylock}/bin/swaylock -f -i HDMI-A-1:${builtins.elemAt config.kw.wallpapers 0} -i DP-1:${builtins.elemAt config.kw.wallpapers 1}  -i DVI-D-1:${builtins.elemAt config.kw.wallpapers 2}' \
-          timeout 600 'swaymsg "output * dpms off"' \
-            resume 'swaymsg "output * dpms on"' \
-          before-sleep '${pkgs.swaylock}/bin/swaylock -f -i HDMI-A-1:${builtins.elemAt config.kw.wallpapers 0} -i DP-1:${builtins.elemAt config.kw.wallpapers 1}  -i DVI-D-1:${builtins.elemAt config.kw.wallpapers 2}'
-      '';
-      RestartSec = 3;
-      Restart = "always";
-    };
-    Install = { WantedBy = [ "sway-session.target" ]; };
-  };
-}
diff --git a/config/hosts/yule/home/sway.nix b/config/hosts/yule/home/sway.nix
index 4fb5bcc2..24f88de4 100644
--- a/config/hosts/yule/home/sway.nix
+++ b/config/hosts/yule/home/sway.nix
@@ -3,49 +3,23 @@
 with lib;
 
 {
-  imports = [ ./swayidle.nix ];
-
-  wayland.windowManager.sway.config =
-    let
-      lockCommand = "swaylock -i eDP-1:${builtins.elemAt config.kw.wallpapers 0} -s fill";
-      cfg = config.wayland.windowManager.sway.config;
+  wayland.windowManager.sway.config = {
+    output = let
+      laptop = {
+        res = "1920x1080";
+        pos = "0 0";
+      };
     in
-    {
-      output =
-        let
-          laptop = {
-            res = "1920x1080";
-            pos = "0 0";
-          };
-        in
-        { "eDP-1" = laptop; };
+    { "eDP-1" = laptop; };
 
-      keybindings = {
-        "${cfg.modifier}+x" = "exec ${lockCommand}";
-      };
-
-      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";
-          };
-      };
-
-      input = {
-        "1739:33362:Synaptics_TM3336-002" = {
-          dwt = "enabled";
-          tap = "enabled";
-          natural_scroll = "enabled";
-          middle_emulation = "enabled";
-          click_method = "clickfinger";
-        };
+    input = {
+      "1739:33362:Synaptics_TM3336-002" = {
+        dwt = "enabled";
+        tap = "enabled";
+        natural_scroll = "enabled";
+        middle_emulation = "enabled";
+        click_method = "clickfinger";
       };
     };
+  };
 }
diff --git a/config/hosts/yule/home/swayidle.nix b/config/hosts/yule/home/swayidle.nix
deleted file mode 100644
index dd9e2d0e..00000000
--- a/config/hosts/yule/home/swayidle.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-{
-  systemd.user.services.swayidle = {
-    Unit = {
-      Description = "swayidle";
-      Documentation = [ "man:swayidle(1)" ];
-      PartOf = [ "graphical-session.target" ];
-    };
-    Service = {
-      Type = "simple";
-      ExecStart = ''
-        ${pkgs.swayidle}/bin/swayidle -w \
-          timeout 300 '${pkgs.swaylock}/bin/swaylock -f  -i eDP-1:${builtins.elemAt config.kw.wallpapers 0} \
-          timeout 600 'swaymsg "output * dpms off"' \
-            resume 'swaymsg "output * dpms on"' \
-          before-sleep '${pkgs.swaylock}/bin/swaylock -f -i eDP-1:${builtins.elemAt config.kw.wallpapers 0}'
-      '';
-      RestartSec = 3;
-      Restart = "always";
-    };
-    Install = { WantedBy = [ "sway-session.target" ]; };
-  };
-}
diff --git a/config/modules/home/theme.nix b/config/modules/home/theme.nix
index e30c1c5d..e6d2e87b 100644
--- a/config/modules/home/theme.nix
+++ b/config/modules/home/theme.nix
@@ -9,10 +9,6 @@ with lib;
 
 let cfg = config.kw; in {
   options.kw = {
-    wallpapers = mkOption {
-      type = types.nullOr (types.listOf types.path);
-      default = [ ../../users/kat/sway/wallpapers/left.jpg ../../users/kat/sway/wallpapers/main.png ../../users/kat/sway/wallpapers/right.jpg ];
-    };
     hexColors = mkOption {
       type = types.attrsOf types.str;
     };
diff --git a/config/profiles/gui/sway.nix b/config/profiles/gui/sway.nix
index edb4352d..2becdb3e 100644
--- a/config/profiles/gui/sway.nix
+++ b/config/profiles/gui/sway.nix
@@ -5,6 +5,6 @@ with lib;
 {
   programs.sway = {
     enable = any (user: user.wayland.windowManager.sway.enable) (attrValues config.home-manager.users);
-    extraPackages = with pkgs; mkForce [ xwayland swaylock swayidle ];
+    extraPackages = with pkgs; mkForce [ xwayland swaylock swayidle swaylock-fancy wmctrl ];
   };
 }
diff --git a/config/users/kat/sway/sway.nix b/config/users/kat/sway/sway.nix
index b485451c..5fab0a1a 100644
--- a/config/users/kat/sway/sway.nix
+++ b/config/users/kat/sway/sway.nix
@@ -6,6 +6,7 @@ let
   footwrap = pkgs.writeShellScriptBin "footwrap" ''
     exec foot "$2"
   '';
+  lockCommand = "${pkgs.swaylock-fancy}/bin/swaylock-fancy -d -t ''";
 in
   {
     home.sessionVariables = {
@@ -19,7 +20,6 @@ in
         default partial alphanumeric_keys
         xkb_symbols "basic" {
         include "us(altgr-intl)"
-        include "level3(caps_switch)"
         name[Group1] = "English (US, international with pound sign)";
         key <AD03> { [ e, E, EuroSign, cent ] };
         key <AE03> { [ 3, numbersign, sterling] };
@@ -65,12 +65,32 @@ in
       }
     '';
 
-    kw.wallpapers = [ ./wallpapers/left.jpg ./wallpapers/main.png ./wallpapers/right.jpg ];
-
-    home.packages = with pkgs; [ grim slurp wl-clipboard jq quintom-cursor-theme gsettings-desktop-schemas glib wofi ];
+    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 = ''
+          ${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" ]; };
+    };
+
     programs.zsh.profileExtra = ''
     # If running from tty1 start sway
       if [ "$(tty)" = "/dev/tty1" ]; then
@@ -96,102 +116,117 @@ in
           "${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%";
+          };
+          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
           {
-            bars = [{ command = "${pkgs.waybar}/bin/waybar"; }];
 
-            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;
-            };
-            terminal = "${pkgs.foot}/bin/foot";
-          menu =
-            "${pkgs.j4-dmenu-desktop}/bin/j4-dmenu-desktop --no-generic --dmenu=\"${dmenu}\" --term='${footwrap}/bin/footwrap'";
-            modifier = "Mod4";
+          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"; }];
 
-            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;
-              }
+      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;
+        };
+        terminal = "${pkgs.foot}/bin/foot";
+        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"'';
+            "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;
+            border = 1;
+            titlebar = false;
             };
 
             floating = {
-              border = 1;
-              titlebar = false;
+            border = 1;
+            titlebar = false;
             };
 
             keybindings = {
-              "${cfg.modifier}+Return" = "exec ${cfg.terminal}";
+            "${cfg.modifier}+Return" = "exec ${cfg.terminal}";
+            "${cfg.modifier}+x" = "exec ${lockCommand}";
 
             # focus windows - regular
             "${cfg.modifier}+Left" = "focus left";
@@ -278,22 +313,22 @@ in
 
             # 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";
+            "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";
+              "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";
@@ -310,86 +345,86 @@ 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"'';
-            };
+                    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"
+                  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}
+                '';
+              };
 
-            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/wallpapers/left.jpg b/config/users/kat/sway/wallpapers/left.jpg
deleted file mode 100644
index f519c4d4..00000000
Binary files a/config/users/kat/sway/wallpapers/left.jpg and /dev/null differ
diff --git a/config/users/kat/sway/wallpapers/main.png b/config/users/kat/sway/wallpapers/main.png
deleted file mode 100644
index 67649a5f..00000000
Binary files a/config/users/kat/sway/wallpapers/main.png and /dev/null differ
diff --git a/config/users/kat/sway/wallpapers/right.jpg b/config/users/kat/sway/wallpapers/right.jpg
deleted file mode 100644
index 9ab53754..00000000
Binary files a/config/users/kat/sway/wallpapers/right.jpg and /dev/null differ
diff --git a/nix/sources.json b/nix/sources.json
index aaf5c0a6..e2540feb 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -41,10 +41,10 @@
         "homepage": "https://nix-community.github.io/home-manager/",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "72394f6d6b1cee26021c3e319fa249122ad33d82",
-        "sha256": "1hnkc81p50qq3zmk75bb132ks9w62mssy76xf2xamqlm6y0k0425",
+        "rev": "a5c609b4b1cd4e1381ac8ea1b7d5b0792ebde0a3",
+        "sha256": "0q8iq96sfrr8vxw36208bx2nbqx3r0i9s5hh75dxd5psc6p84vl4",
         "type": "tarball",
-        "url": "https://github.com/nix-community/home-manager/archive/72394f6d6b1cee26021c3e319fa249122ad33d82.tar.gz",
+        "url": "https://github.com/nix-community/home-manager/archive/a5c609b4b1cd4e1381ac8ea1b7d5b0792ebde0a3.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "katexprs": {
@@ -87,10 +87,10 @@
         "homepage": "",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "23485f23ff8536592b5178a5d244f84da770bc87",
-        "sha256": "1x1r93za9fmaqa31d32whxns87x8iwl7bjfl52jwl79zmxg8pqxc",
+        "rev": "2435ea48c3b295d9cd490535730bb13ab8cfd8a5",
+        "sha256": "02ph4di27alkykj4dcr4zfp2ply2zs4wh3gwpz5cs90l0ycy0fxk",
         "type": "tarball",
-        "url": "https://github.com/nixos/nixpkgs/archive/23485f23ff8536592b5178a5d244f84da770bc87.tar.gz",
+        "url": "https://github.com/nixos/nixpkgs/archive/2435ea48c3b295d9cd490535730bb13ab8cfd8a5.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nur": {
@@ -99,10 +99,10 @@
         "homepage": "https://nur.nix-community.org/",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "500f9f4002243ac3d7478348495d830abb6721e0",
-        "sha256": "1plvb4byi2y4l6l4v501hb45s1kqhnz37raba476q4zkv82x6qi7",
+        "rev": "a36f8ccb369df230fc75adc019ed73876c6eb06d",
+        "sha256": "1m5csfr01j5s9q8d5azysjizwxv4lxggpyy4p5cn77ygcpxy2pw3",
         "type": "tarball",
-        "url": "https://github.com/nix-community/NUR/archive/500f9f4002243ac3d7478348495d830abb6721e0.tar.gz",
+        "url": "https://github.com/nix-community/NUR/archive/a36f8ccb369df230fc75adc019ed73876c6eb06d.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "tf-nix": {
@@ -111,10 +111,10 @@
         "homepage": null,
         "owner": "arcnmx",
         "repo": "tf-nix",
-        "rev": "389de5b7a2843eea2208b056ed6a36d73260f2b0",
-        "sha256": "0p2z5w61g404sin2pb6vwq83dm1d1kkrfpwwc7q2jc7zgpwb3plv",
+        "rev": "a1eb4c4203d13e644b8e7336777b354fe499c3fe",
+        "sha256": "00p2njqxa5wld3q1qqw80kxm5bprb3k7jhpqmv9rf5bbixgd4zdp",
         "type": "tarball",
-        "url": "https://github.com/arcnmx/tf-nix/archive/389de5b7a2843eea2208b056ed6a36d73260f2b0.tar.gz",
+        "url": "https://github.com/arcnmx/tf-nix/archive/a1eb4c4203d13e644b8e7336777b354fe499c3fe.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }