diff --git a/home/calypso.nix b/home/calypso.nix
index 60af947..412b74f 100644
--- a/home/calypso.nix
+++ b/home/calypso.nix
@@ -25,6 +25,7 @@
     # signal-desktop # Signal client
     # element-desktop # Matrix client
     # zoom-us # Zoom client 🤮
+    whatsapp-for-linux
     # }}}
     # {{{ Editors for different formats
     gimp # Image editing
diff --git a/home/features/cli/productivity/mail.nix b/home/features/cli/productivity/mail.nix
index 5e50214..73f981d 100644
--- a/home/features/cli/productivity/mail.nix
+++ b/home/features/cli/productivity/mail.nix
@@ -1,4 +1,5 @@
-{ config, ... }: {
+{ config, ... }:
+{
   sops.secrets.moonythm_mail_pass.sopsFile = ./secrets.yaml;
 
   programs.msmtp.enable = true;
@@ -14,7 +15,7 @@
   accounts.email.accounts = {
     # {{{ Moonythm
     moonythm = rec {
-      # {{{ Primary config 
+      # {{{ Primary config
       address = "colimit@moonythm.dev";
       realName = "prescientmoon";
       userName = address;
@@ -61,10 +62,16 @@
       neomutt = {
         enable = true;
         sendMailCommand = "msmtpq --read-envelope-from --read-recipients";
-        extraMailboxes = [ "Archive" "Drafts" "Junk" "Sent" "Trash" ];
+        extraMailboxes = [
+          "Archive"
+          "Drafts"
+          "Junk"
+          "Sent"
+          "Trash"
+        ];
       };
       # }}}
-      # {{{ Aerc 
+      # {{{ Aerc
       aerc = {
         enable = true;
       };
@@ -79,9 +86,9 @@
     extraConfig.general.unsafe-accounts-conf = true;
   };
   # }}}
-  # {{{ Neomutt 
+  # {{{ Neomutt
   programs.neomutt = {
-    # {{{ Primary config 
+    # {{{ Primary config
     enable = true;
     vimKeys = true;
     checkStatsInterval = 60; # How often to check for new mail
@@ -92,30 +99,42 @@
     # }}}
 
     binds = [
-      # {{{ Toggle sidebar 
+      # {{{ Toggle sidebar
       {
-        map = [ "index" "pager" ];
+        map = [
+          "index"
+          "pager"
+        ];
         key = "B";
         action = "sidebar-toggle-visible";
       }
       # }}}
       # {{{ Highlight previous sidebar item
       {
-        map = [ "index" "pager" ];
+        map = [
+          "index"
+          "pager"
+        ];
         key = "\\CK";
         action = "sidebar-prev";
       }
       # }}}
       # {{{ Highlight next sidebar item
       {
-        map = [ "index" "pager" ];
+        map = [
+          "index"
+          "pager"
+        ];
         key = "\\CJ";
         action = "sidebar-next";
       }
       # }}}
       # {{{ Open highlighted sidebar item
       {
-        map = [ "index" "pager" ];
+        map = [
+          "index"
+          "pager"
+        ];
         key = "\\CO";
         action = "sidebar-open";
       }
@@ -144,7 +163,7 @@
     extraConfig = ''
       # Starting point: https://seniormars.com/posts/neomutt/#introduction-and-why
       # {{{ Settings
-      set pager_index_lines = 10          
+      set pager_index_lines = 10
       set pager_context = 3                # show 3 lines of context
       set pager_stop                       # stop at end of message
       set menu_scroll                      # scroll menu
@@ -334,7 +353,11 @@
         exec = "neomutt %U";
         icon = "mutt";
         terminal = true;
-        categories = [ "Network" "Email" "ConsoleOnly" ];
+        categories = [
+          "Network"
+          "Email"
+          "ConsoleOnly"
+        ];
         type = "Application";
         mimeType = [ "x-scheme-handler/mailto" ];
       };
@@ -345,10 +368,8 @@
   };
   # }}}
   # }}}
-  # {{{ Storage & persistence 
-  accounts.email.maildirBasePath = "${config.home.homeDirectory}/maildir";
-  satellite.persistence.at.data.apps.mail.directories = [
-    config.accounts.email.maildirBasePath
-  ];
+  # {{{ Storage & persistence
+  accounts.email.maildirBasePath = "${config.xdg.dataHome}/maildir";
+  satellite.persistence.at.data.apps.mail.directories = [ config.accounts.email.maildirBasePath ];
   # }}}
 }
diff --git a/home/features/cli/productivity/smos/default.nix b/home/features/cli/productivity/smos/default.nix
index 5206edd..f45a57b 100644
--- a/home/features/cli/productivity/smos/default.nix
+++ b/home/features/cli/productivity/smos/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 let
-  workflowDir = "${config.home.homeDirectory}/productivity/smos";
+  workflowDir = "${config.xdg.dataHome}/smos/workflow";
 in
 {
   sops.secrets.smos_password.sopsFile = ../secrets.yaml;
diff --git a/hosts/nixos/common/optional/users/common.nix b/hosts/nixos/common/optional/users/common.nix
deleted file mode 100644
index a1753ca..0000000
--- a/hosts/nixos/common/optional/users/common.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  authorizedKeys = { outputs, lib }:
-
-}
diff --git a/hosts/nixos/common/optional/users/guest.nix b/hosts/nixos/common/optional/users/guest.nix
deleted file mode 100644
index 64c2dbd..0000000
--- a/hosts/nixos/common/optional/users/guest.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# For more comments check out [pilot](./pilot.nix)
-{
-  pkgs,
-  outputs,
-  lib,
-  ...
-}:
-{
-  users.mutableUsers = false;
-  users.users.guest = {
-    isNormalUser = true;
-    shell = pkgs.fish;
-    extraGroups = [
-      "wheel"
-      "audio"
-      "video"
-      "network"
-      "tty"
-    ];
-    password = "heyo";
-    openssh.authorizedKeys.keyFiles = (import ./common.nix).authorizedKeys { inherit outputs lib; };
-  };
-}
diff --git a/hosts/nixos/common/optional/users/pilot.nix b/hosts/nixos/common/optional/users/pilot.nix
index 47bc217..d56e292 100644
--- a/hosts/nixos/common/optional/users/pilot.nix
+++ b/hosts/nixos/common/optional/users/pilot.nix
@@ -12,7 +12,7 @@
 
   # {{{ Password handling
   sops.secrets.pilot_password = {
-    sopsFile = ../secrets.yaml;
+    sopsFile = ../../secrets.yaml;
     neededForUsers = true;
   };
   # }}}