diff --git a/hosts/kitty/users/corn/default.nix b/hosts/kitty/users/corn/default.nix
new file mode 100644
index 00000000..20ca5f2e
--- /dev/null
+++ b/hosts/kitty/users/corn/default.nix
@@ -0,0 +1,15 @@
+{ ... }:
+{
+  users.users."corn" = {
+    isNormalUser = true;
+    createHome = true;
+    openssh.authorizedKeys.keys = [
+      "AAAAC3NzaC1lZDI1NTE5AAAAIKaZsnlyUJDNx2oK4iHsUDb+Ok4vg1jNYEAnoHsjjM2c Chinook"
+      "AAAAC3NzaC1lZDI1NTE5AAAAICtoHVAmq8Ps7EguBsV3VY4snagzkhH6aXqwbKzuGs2H Radiant"
+    ];
+    uid = 1001;
+    shell = pkgs.zsh;
+  };
+
+  environment.persistence."/persist".directories = [ "/home/corn" ];
+}
diff --git a/hosts/kitty/users/default.nix b/hosts/kitty/users/default.nix
index 57e7f20b..303e215a 100644
--- a/hosts/kitty/users/default.nix
+++ b/hosts/kitty/users/default.nix
@@ -1,4 +1,7 @@
 { ... }:
 {
-  imports = [ ./main ];
+  imports = [
+    ./main
+    ./corn
+  ];
 }
diff --git a/hosts/tower/disko/default.nix b/hosts/tower/disko/default.nix
index e3aa3035..8b56d84a 100644
--- a/hosts/tower/disko/default.nix
+++ b/hosts/tower/disko/default.nix
@@ -68,8 +68,8 @@
                   mountOptions = [ "compress=zstd" "noatime" "ssd" ];
                 };
                 "/persist/.snapshots" = { };
-                "/persist/home/${config.sysusers.main}" = { };
-                "/persist/home/${config.sysusers.main}/.snapshots" = { };
+                "/persist/home" = { };
+                "/persist/home/.snapshots" = { };
               };
             };
           };
diff --git a/modules/home/programs/terminal/ranger/default.nix b/modules/home/programs/terminal/ranger/default.nix
index d761c1ba..c86fd380 100644
--- a/modules/home/programs/terminal/ranger/default.nix
+++ b/modules/home/programs/terminal/ranger/default.nix
@@ -105,10 +105,11 @@
         c:/home/${config.home.username}/.config
         l:/home/${config.home.username}/.local
         d:/mnt
+        p:/persist
         n:/etc/nixos
 
         # Remote files
-        H:/home/${config.home.username}/Midas
+        H:/home/${config.home.username}/Midas/storage
         K:/home/${config.home.username}/Midas/storage/Files
         V:/home/${config.home.username}/Midas/storage/Media
         M:/home/${config.home.username}/Midas/storage/Music
diff --git a/modules/system/devices/disks/impermanence/main/default.nix b/modules/system/devices/disks/impermanence/main/default.nix
index cca8d2c8..f75b6cc8 100644
--- a/modules/system/devices/disks/impermanence/main/default.nix
+++ b/modules/system/devices/disks/impermanence/main/default.nix
@@ -11,7 +11,6 @@
         "Games"
         "VMs"
 
-        ".snapshots"
         ".mozilla"
         ".thunderbird"
 
diff --git a/modules/system/devices/disks/snapper/default.nix b/modules/system/devices/disks/snapper/default.nix
index 112c3787..dda37e31 100644
--- a/modules/system/devices/disks/snapper/default.nix
+++ b/modules/system/devices/disks/snapper/default.nix
@@ -1,7 +1,7 @@
 { ... }:
 {
   imports = [
-    ./main
+    ./home
     ./root
   ];
 
diff --git a/modules/system/devices/disks/snapper/main/default.nix b/modules/system/devices/disks/snapper/home/default.nix
similarity index 55%
rename from modules/system/devices/disks/snapper/main/default.nix
rename to modules/system/devices/disks/snapper/home/default.nix
index cac62e46..6d85aea1 100644
--- a/modules/system/devices/disks/snapper/main/default.nix
+++ b/modules/system/devices/disks/snapper/home/default.nix
@@ -1,7 +1,7 @@
 { config, lib, ... }:
 {
-  services.snapper.configs.${config.sysusers.main} = lib.mkIf config.environment.persistence."/persist".enable {
-    SUBVOLUME = "/persist/home/${config.sysusers.main}";
+  services.snapper.configs.home = lib.mkIf config.environment.persistence."/persist".enable {
+    SUBVOLUME = "/persist/home";
     TIMELINE_CREATE = true;
     TIMELINE_CLEANUP = true;
     TIMELINE_LIMIT_DAILY = 1;
diff --git a/modules/system/secrets/default.nix b/modules/system/secrets/default.nix
index 1a44f144..08d97784 100644
Binary files a/modules/system/secrets/default.nix and b/modules/system/secrets/default.nix differ
diff --git a/modules/system/users/main/default.nix b/modules/system/users/main/default.nix
index e9e29832..6d36fbaa 100644
--- a/modules/system/users/main/default.nix
+++ b/modules/system/users/main/default.nix
@@ -10,7 +10,7 @@
     users.users."${config.sysusers.main}" = {
       isNormalUser = true;
       createHome = true;
-      hashedPassword = config.secrets.mainAccPass;
+      hashedPassword = config.secrets.accPass.main;
       openssh.authorizedKeys.keyFiles = [
         ../../../../hosts/tower/id_ed25519.pub
         ../../../../hosts/kitty/id_ed25519.pub