diff --git a/imports/github/nana-4/materia-theme b/imports/github/nana-4/materia-theme
index 213169b..a7d4b8e 160000
--- a/imports/github/nana-4/materia-theme
+++ b/imports/github/nana-4/materia-theme
@@ -1 +1 @@
-Subproject commit 213169b97b2e2d20366339708b310f560013b669
+Subproject commit a7d4b8e513a06846aa6f320e181d5b9dc53dc07a
diff --git a/install/install.sh b/install/install.sh
index 94d5716..0d135a7 100644
--- a/install/install.sh
+++ b/install/install.sh
@@ -30,7 +30,11 @@ btrfs subvolume create /mnt/var
 mkdir /mnt/boot
 mount $BOOT_PARTITION /mnt/boot
 # create swap
-mkfs.ext2 -L $SWAP_NAME $SWAP_PARTITION 1M
+dd count=1 bs=256 if=/dev/urandom of=/mnt/root/swap.key
+cryptsetup --type luks2 --cipher aes-xts-plain64 --key-size 256 --hash sha512 --key-file /mnt/root/swap.key luksFormat $SWAP_PARTITION
+cryptsetup --key-file /mnt/root/swap.key luksOpen $SWAP_PARTITION $SWAP_NAME
+mkswap -L swap /dev/mapper/cryptswap
+swapon -L swap
 nixos-generate-config --root /mnt/
 cp ./min-config.nix /mnt/etc/nixos/configuration.nix
 nano /mnt/etc/nixos/configuration.nix
diff --git a/modules/applications/packages.nix b/modules/applications/packages.nix
index 5b9a257..44cb04e 100644
--- a/modules/applications/packages.nix
+++ b/modules/applications/packages.nix
@@ -22,6 +22,8 @@ with deviceSpecific; {
     # Samba support
     cifs-utils
     # Utils
+    pciutils
+    usbutils
     nix-prefetch-git
     hdparm
     vdpauinfo
diff --git a/modules/filesystems.nix b/modules/filesystems.nix
index 80616c4..db3195e 100644
--- a/modules/filesystems.nix
+++ b/modules/filesystems.nix
@@ -1,8 +1,9 @@
 { pkgs, lib, config, ... }:
 with rec {
-  inherit (config) deviceSpecific secrets;
+  inherit (config) device deviceSpecific secrets;
 };
 with deviceSpecific; {
+  boot.resumeDevice = "/dev/mapper/cryptswap";
   fileSystems = {
     "/" = {
       options = if isSSD then
@@ -67,4 +68,18 @@ with deviceSpecific; {
       ];
     };
   };
+  swapDevices = [
+    {
+      device = "/dev/mapper/cryptswap";
+      encrypted = {
+        enable = true;
+        keyFile = "/mnt-root/root/swap.key";
+        label = "cryptswap";
+        blkDev = if device == "Dell-Laptop" then
+          "/dev/disk/by-uuid/c623d956-d0ea-4626-8e0c-5092bbbf3b0c"
+        else
+          "";
+      };
+    }
+  ];
 }
\ No newline at end of file
diff --git a/modules/hardware.nix b/modules/hardware.nix
index 3babf23..482f5a4 100644
--- a/modules/hardware.nix
+++ b/modules/hardware.nix
@@ -39,11 +39,13 @@ with deviceSpecific; {
     pkgs.linuxPackages
   else
     pkgs.linuxPackages_latest;
-  boot.zfs.enableUnstable = true; # For latest kernel
   boot.supportedFilesystems = [ "ntfs" ];
   boot.blacklistedKernelModules = lib.mkIf (device == "Dell-Laptop") [
     "psmouse"
   ];
+  boot.kernelParams = lib.mkIf (device == "Dell-Laptop") [
+    "mem_sleep_default=deep"
+  ];
 
   sound.enable = true;
   hardware.pulseaudio = {
diff --git a/modules/workspace/i3/default.nix b/modules/workspace/i3/default.nix
index 6175390..07d6e66 100644
--- a/modules/workspace/i3/default.nix
+++ b/modules/workspace/i3/default.nix
@@ -72,12 +72,12 @@ in {
         script = name: content: "exec ${pkgs.writeScript name content}";
         workspaces = (builtins.genList (x: [ (toString x) (toString x) ]) 10)
           ++ [ [ "c" "" ] [ "t" "" ] [ "m" "ﱘ" ] ];
-        moveMouse = ''
-          "sh -c 'eval `${pkgs.xdotool}/bin/xdotool \
-                getactivewindow \
-                getwindowgeometry --shell`; ${pkgs.xdotool}/bin/xdotool \
-                mousemove \
-                $((X+WIDTH/2)) $((Y+HEIGHT/2))'"'';
+        # moveMouse = ''
+        #   "sh -c 'eval `${pkgs.xdotool}/bin/xdotool \
+        #         getactivewindow \
+        #         getwindowgeometry --shell`; ${pkgs.xdotool}/bin/xdotool \
+        #         mousemove \
+        #         $((X+WIDTH/2)) $((Y+HEIGHT/2))'"'';
         in ({
           "${modifier}+q" = "kill";
           "${modifier}+w" = "exec ${apps.dmenu.cmd}";
@@ -85,14 +85,22 @@ in {
           "${modifier}+e" = "exec ${apps.editor.cmd}";
           "${modifier}+l" = "layout toggle all";
 
-          "${modifier}+Left" = "focus child; focus left; ${moveMouse}";
-          "${modifier}+Right" = "focus child; focus right; ${moveMouse}";
-          "${modifier}+Up" = "focus child; focus up; ${moveMouse}";
-          "${modifier}+Down" = "focus child; focus down; ${moveMouse}";
-          "${modifier}+Control+Left" = "focus parent; focus left; ${moveMouse}";
-          "${modifier}+Control+Right" = "focus parent; focus right; ${moveMouse}";
-          "${modifier}+Control+Up" = "focus parent; focus up; ${moveMouse}";
-          "${modifier}+Control+Down" = "focus parent; focus down; ${moveMouse}";
+          "${modifier}+Left" = "focus child; focus left";
+          "${modifier}+Right" = "focus child; focus right";
+          "${modifier}+Up" = "focus child; focus up";
+          "${modifier}+Down" = "focus child; focus down";
+          "${modifier}+Control+Left" = "focus parent; focus left";
+          "${modifier}+Control+Right" = "focus parent; focus right";
+          "${modifier}+Control+Up" = "focus parent; focus up";
+          # "${modifier}+Control+Down" = "focus parent; focus down; ${moveMouse}";
+          # "${modifier}+Left" = "focus child; focus left; ${moveMouse}";
+          # "${modifier}+Right" = "focus child; focus right; ${moveMouse}";
+          # "${modifier}+Up" = "focus child; focus up; ${moveMouse}";
+          # "${modifier}+Down" = "focus child; focus down; ${moveMouse}";
+          # "${modifier}+Control+Left" = "focus parent; focus left; ${moveMouse}";
+          # "${modifier}+Control+Right" = "focus parent; focus right; ${moveMouse}";
+          # "${modifier}+Control+Up" = "focus parent; focus up; ${moveMouse}";
+          # "${modifier}+Control+Down" = "focus parent; focus down; ${moveMouse}";
           "${modifier}+Shift+Up" = "move up";
           "${modifier}+Shift+Down" = "move down";
           "${modifier}+Shift+Right" = "move right";
diff --git a/modules/workspace/misc.nix b/modules/workspace/misc.nix
index 3f0afe7..642e778 100644
--- a/modules/workspace/misc.nix
+++ b/modules/workspace/misc.nix
@@ -12,6 +12,11 @@
     xdg.enable = true;
 
     services.udiskie.enable = true;
+    services.screen-locker = {
+      enable = true;
+      inactiveInterval = 15; # Minutes
+      lockCmd = "${pkgs.i3lock-fancy}/bin/i3lock-fancy -f Roboto-Medium";
+    };
     programs.git = {
       enable = true;
       userEmail = "alukard.develop@gmail.com";