diff --git a/modules/datasync.nix b/modules/datasync.nix
index 9874ddc..96f37c3 100644
--- a/modules/datasync.nix
+++ b/modules/datasync.nix
@@ -10,23 +10,23 @@
       recvu = true;
     };
     zetup = {
-      "syscea/state/root" = {
+      "syscea/stateful/root" = {
         plan = "1d=>1h,1m=>1d,1y=>1m";
         recursive = true;
         mbuffer.enable = true;
         destinations.remote = {
           host = "coolneng@zion";
-          dataset = "syscea/root";
+          dataset = "vault/backups/panacea/root";
         };
       }; 
 
-      "syscea/state/home" = {
+      "syscea/stateful/home" = {
         plan = "1d=>1h,1m=>1d,1y=>1m";
         recursive = true;
         mbuffer.enable = true;
         destinations.remote = {
           host = "coolneng@zion";
-          dataset = "syscea/home";
+          dataset = "vault/backups/panacea/home";
         };
       }; 
     };
@@ -39,10 +39,7 @@
     dataDir = "/home/coolneng";
     declarative = {
       devices = {
-        zion = {
-          id = "XABIMVG-K5RKMAF-KNC33AR-TDAVEGK-GHUIVFD-NIFCX6L-6PQXRM5-KLK2PAU";
-          addresses = ["tcp://coolneng.duckdns.org:22000"];
-        };
+        zion = { id = "XABIMVG-K5RKMAF-KNC33AR-TDAVEGK-GHUIVFD-NIFCX6L-6PQXRM5-KLK2PAU"; };
       };
       folders = {
         Documents = {
@@ -83,7 +80,6 @@
 
         Projects = {
           id = "cjhmu-avy9v";
-          type = "sendonly";
           path = "/home/coolneng/Projects";
           devices = [ "zion" ];
         };
diff --git a/modules/gui.nix b/modules/gui.nix
index 1d31e62..743d6cb 100644
--- a/modules/gui.nix
+++ b/modules/gui.nix
@@ -20,16 +20,17 @@
     extraPackages = with pkgs; [
       xwayland
       swaylock
+      swayidle
       swaybg
       rofi
       waybar
       clipman
+      wl-clipboard
       grim
       slurp
       light
       imv
       kanshi
-      redshift-wlr
       kitty
     ];
     extraSessionCommands = ''
@@ -42,7 +43,7 @@
       export SDL_VIDEODRIVER=wayland
     '';
   };
-   
+
   # Backlight
   programs.light.enable = true;
 
@@ -54,14 +55,17 @@
       day = 6500;
       night = 5000;
     };
-    extraOptions = [ "-m wayland" "-l manual"];
   };
 
   location = {
     latitude = 35.89;
     longitude = -5.32;
+    provider = "manual";
   };
 
   # Bar
   programs.waybar.enable = true;
+
+  # GPG agent
+  programs.gnupg.agent = { enable = true; };
 }
diff --git a/modules/software.nix b/modules/software.nix
index 5b199e4..bcac804 100644
--- a/modules/software.nix
+++ b/modules/software.nix
@@ -5,11 +5,13 @@
     # Monitoring
     htop
     # Password management
+    gnupg
+    pinentry-curses
     pass-wayland
     passff-host
     gitAndTools.pass-git-helper
     # Browsers
-    firefox
+    (firefox.override { extraNativeMessagingHosts = [ passff-host ]; })
     chromium
     # LaTeX
     texlive.combined.scheme-full
@@ -29,6 +31,10 @@
     git
     direnv
     lorri
+    nixfmt
+    # Rice
+    adapta-gtk-theme
+    paper-icon-theme
   ];
 
   # Fonts declaration
@@ -38,6 +44,7 @@
       siji
       cherry
       iosevka
+      emacs-all-the-icons-fonts
     ];
   };