diff --git a/hosts/jupiter/services/default.nix b/hosts/jupiter/services/default.nix
index c9fea6b7..f633f5d2 100644
--- a/hosts/jupiter/services/default.nix
+++ b/hosts/jupiter/services/default.nix
@@ -5,7 +5,10 @@
 
     services.globalprotect.enable = true;
 
-    virtualisation.vmware.host.enable = true;
+    virtualisation = {
+      libvirtd.enable = true;
+      vmware.host.enable = true;
+    };
 
     nixpkgs.allowUnfreePackages = [ "vmware-workstation" ];
 
diff --git a/modules/home/programs/terminal/default.nix b/modules/home/programs/terminal/default.nix
index 8a79ff6b..6d8f3522 100644
--- a/modules/home/programs/terminal/default.nix
+++ b/modules/home/programs/terminal/default.nix
@@ -15,6 +15,7 @@
     ./ranger
     ./tmux
     ./yt-dlp
+    ./zoxide
     ./zsh
   ];
 }
diff --git a/modules/home/programs/terminal/nix-index/default.nix b/modules/home/programs/terminal/nix-index/default.nix
index f02dd683..58f33a55 100644
--- a/modules/home/programs/terminal/nix-index/default.nix
+++ b/modules/home/programs/terminal/nix-index/default.nix
@@ -1,5 +1,6 @@
 { config, ... }:
 {
   programs.nix-index.enable = true;
+
   home.persistence."/persist${config.home.homeDirectory}".directories = [ ".cache/nix-index" ];
 }
diff --git a/modules/home/programs/terminal/ranger/default.nix b/modules/home/programs/terminal/ranger/default.nix
index 118e9e5d..d6d55b5d 100644
--- a/modules/home/programs/terminal/ranger/default.nix
+++ b/modules/home/programs/terminal/ranger/default.nix
@@ -97,15 +97,17 @@
     file = {
       ".local/share/ranger/bookmarks".text = ''
         # Local files
-        h:${config.home.homeDirectory}/
+        h:${config.home.homeDirectory}
         k:${config.home.homeDirectory}/Keepers
         j:${config.home.homeDirectory}/Downloads
+        j:${config.home.homeDirectory}/Documents
+        p:${config.home.homeDirectory}/Photos
         v:${config.home.homeDirectory}/Videos
         n:${config.home.homeDirectory}/Projects/nixos-config
         c:${config.home.homeDirectory}/.config
         l:${config.home.homeDirectory}/.local
-        d:/mnt
-        p:/persist
+        q:/persist
+        w:/mnt
 
         # Remote files
         N:${config.home.homeDirectory}/Network
diff --git a/modules/home/programs/terminal/zoxide/default.nix b/modules/home/programs/terminal/zoxide/default.nix
new file mode 100644
index 00000000..4ad919d8
--- /dev/null
+++ b/modules/home/programs/terminal/zoxide/default.nix
@@ -0,0 +1,6 @@
+{ config, ... }:
+{
+  programs.zoxide.enable = true;
+
+  home.persistence."/persist${config.home.homeDirectory}".directories = [ ".local/share/zoxide" ];
+}
diff --git a/modules/home/services/gnome-keyring/default.nix b/modules/home/services/gnome-keyring/default.nix
index a1d5e652..3c2316b6 100644
--- a/modules/home/services/gnome-keyring/default.nix
+++ b/modules/home/services/gnome-keyring/default.nix
@@ -1,4 +1,7 @@
-{ config, ... }:
+{ config, lib, ... }:
 {
-  services.gnome-keyring.enable = config.home.desktop.enable;
+  config = lib.mkIf config.home.desktop.enable {
+    services.gnome-keyring.enable = true;
+    home.persistence."/persist${config.home.homeDirectory}".directories = [ ".local/share/keyrings" ];
+  };
 }
diff --git a/modules/home/services/impermanence/default.nix b/modules/home/services/impermanence/default.nix
index 81ab8bae..037035c0 100644
--- a/modules/home/services/impermanence/default.nix
+++ b/modules/home/services/impermanence/default.nix
@@ -11,13 +11,11 @@
       ".gnupg"
     ] ++ (if config.home.desktop.enable then [
       "Documents"
-      "Pictures"
+      "Photos"
       "Videos"
       "Games"
       "VMs"
 
-      ".config/sunshine"
-      ".local/share/keyrings"
       ".local/state/wireplumber"
     ] else []);
     allowOther = false;
diff --git a/modules/home/settings/xdg/folders/default.nix b/modules/home/settings/xdg/folders/default.nix
index 37f3c97f..470cd693 100644
--- a/modules/home/settings/xdg/folders/default.nix
+++ b/modules/home/settings/xdg/folders/default.nix
@@ -4,8 +4,10 @@
     enable = config.home.desktop.enable;
     createDirectories = true;
     desktop = null;
+    pictures = "${config.home.homeDirectory}/Photos";
     music = null;
     publicShare = null;
     templates = null;
+    extraConfig.XDG_SCREENSHOTS_DIR = "${config.xdg.userDirs.pictures}/Screenshots";
   };
 }
diff --git a/modules/home/user/default.nix b/modules/home/user/default.nix
index 56f3db5c..4d354939 100644
--- a/modules/home/user/default.nix
+++ b/modules/home/user/default.nix
@@ -8,7 +8,6 @@
       LIBVIRT_DEFAULT_URI = "qemu:///system";
       MANPAGER = "nvim +Man!";
       NIXPKGS_ALLOW_UNFREE = 1;
-      XDG_SCREENSHOTS_DIR = "$XDG_PICTURES_DIR/Screenshots";
       ZSH_DISABLE_COMPFIX = "true";
     };
   };
diff --git a/modules/home/wms/programs/default.nix b/modules/home/wms/programs/default.nix
index 10484976..d1ffa6d8 100644
--- a/modules/home/wms/programs/default.nix
+++ b/modules/home/wms/programs/default.nix
@@ -1,7 +1,6 @@
 { config, lib, pkgs, ... }:
 {
   imports = [
-    ./grimsnap
     ./kanshi
     ./mako
     ./swaylock
diff --git a/modules/home/wms/programs/grimsnap/default.nix b/modules/home/wms/programs/grimsnap/default.nix
deleted file mode 100644
index 538c30ea..00000000
--- a/modules/home/wms/programs/grimsnap/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ config, lib, pkgs, ... }: 
-{
-  home.packages = with pkgs; lib.mkIf config.home.desktop.enable [
-    (pkgs.writeScriptBin "grimsnap" ''
-      # Freeze the screen using hyprpicker
-      hyprpicker -r -z &
-      HYPRPICKER_PID=$!
-      sleep 0.1
-      
-      # Select area
-      GEOM=$(slurp -w 3 -c ${config.look.colors.prime} -B 00000066 -b 00000099)
-      
-      # Check selection is canceled
-      if [ -z "$GEOM" ]; then
-        kill $HYPRPICKER_PID 2>/dev/null
-        notify-send -t 3000 -a grim "Error" "No area selected."
-        exit 1
-      fi
-      
-      # Define screenshot destination
-      FILE="''${XDG_PICTURES_DIR:-$HOME/Pictures}/Screenshots/$(date -Ins).png"
-      
-      # Save and edit screenshot
-      grim -g "$GEOM" "$FILE"
-      
-      # Notify user that the screenshot is saved
-      notify-send -a grim "Screenshot" "Area saved to $FILE" -i "$FILE"
-      
-      # Kill picker after selection
-      kill %1 2>/dev/null
-    '')
-  ];
-}
diff --git a/modules/home/wms/sway/hotkeys/default.nix b/modules/home/wms/sway/hotkeys/default.nix
index 988e3967..299b1f22 100644
--- a/modules/home/wms/sway/hotkeys/default.nix
+++ b/modules/home/wms/sway/hotkeys/default.nix
@@ -60,8 +60,9 @@
       "${primeMod}+Ctrl+n" = ''exec makoctl dismiss -a'';
 
       # Screenshots
-      "${secMod}+f" = ''exec grimsnap'';
-      "${secMod}+Shift+f" = ''exec shot-sway --screen'';
+      "${secMod}+f" = ''exec ${pkgs.shotman}/bin/shotman --copy --capture region'';
+      "${secMod}+Shift+f" = ''exec ${pkgs.shotman}/bin/shotman --copy --capture window'';
+      "${secMod}+Ctrl+f" = ''exec ${pkgs.shotman}/bin/shotman --copy --capture output'';
 
       # Display brightness
       "${primeMod}+equal" = ''exec brightnessctl s 5%+'';
diff --git a/modules/system/services/general/default.nix b/modules/system/services/general/default.nix
index 34cd1184..95d3b81c 100644
--- a/modules/system/services/general/default.nix
+++ b/modules/system/services/general/default.nix
@@ -8,7 +8,6 @@
     ./portals
     ./snowflake
     ./ssh
-    ./sunshine
     ./tlp
     ./userborn
   ];
diff --git a/modules/system/services/general/sunshine/default.nix b/modules/system/services/general/sunshine/default.nix
deleted file mode 100644
index 8e928b0d..00000000
--- a/modules/system/services/general/sunshine/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, ... }:
-{
-  services.sunshine = {
-    enable = config.system.desktop.enable;
-    autoStart = false;
-    capSysAdmin = true;
-    openFirewall = true;
-  };
-}