diff --git a/nixcfgs/users/js0ny/packages/gui.nix b/nixcfgs/users/js0ny/packages/gui.nix
index 211aa01..d6e5d71 100644
--- a/nixcfgs/users/js0ny/packages/gui.nix
+++ b/nixcfgs/users/js0ny/packages/gui.nix
@@ -121,6 +121,7 @@ in {
       newsflash
       mission-center
       calibre
+      dconf-editor
     ]
     ++ (mkFcitxIM [
       pkgs.neovim-qt
@@ -165,4 +166,11 @@ in {
   services.remmina.enable = false; # Don't auto start the service
 
   gtk.gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
+
+  dconf.settings = {
+    "ca/desrt/dconf-editor" = {
+      show-warning = false;
+    };
+  };
+  programs.waveterm.enable = true;
 }
diff --git a/nixcfgs/users/js0ny/programs/desktop/gnome/default.nix b/nixcfgs/users/js0ny/programs/desktop/gnome/default.nix
index 750812c..029fd8e 100644
--- a/nixcfgs/users/js0ny/programs/desktop/gnome/default.nix
+++ b/nixcfgs/users/js0ny/programs/desktop/gnome/default.nix
@@ -22,7 +22,6 @@ in {
     [
       gnome-tweaks
       sushi
-      dconf-editor
     ]
     ++ extensions;
   programs.gnome-shell.enable = true;
@@ -147,9 +146,6 @@ in {
         "/home/${config.home.username}/Academia"
       ];
     };
-    "ca/desrt/dconf-editor" = {
-      show-warning = false;
-    };
     # Extension settings
     "org/gnome/shell/extensions/Logo-menu" = {
       menu-button-icon-image = 23;
diff --git a/nixcfgs/users/js0ny/programs/desktop/wayland-wm/packages.nix b/nixcfgs/users/js0ny/programs/desktop/wayland-wm/packages.nix
index 5321e89..bd77bbd 100644
--- a/nixcfgs/users/js0ny/programs/desktop/wayland-wm/packages.nix
+++ b/nixcfgs/users/js0ny/programs/desktop/wayland-wm/packages.nix
@@ -67,4 +67,5 @@ in {
   services.blueman-applet.enable = true;
   services.blueman-applet.systemdTargets = ["niri.service"];
   systemd.user.services.network-manager-applet.Install.WantedBy = lib.mkForce ["niri.service"];
+  programs.wleave.enable = true;
 }
diff --git a/nixcfgs/users/js0ny/zephyrus.nix b/nixcfgs/users/js0ny/zephyrus.nix
index bc64185..8974d3f 100644
--- a/nixcfgs/users/js0ny/zephyrus.nix
+++ b/nixcfgs/users/js0ny/zephyrus.nix
@@ -1,5 +1,11 @@
 # ~/.config/nixcfgs/users/js0ny/default.nix
-{pkgs, ...}: {
+{
+  pkgs,
+  config,
+  ...
+}: let
+  username = config.home.username;
+in {
   imports = [
     # General config
     ./default.nix
@@ -125,13 +131,11 @@
     "$HOME/.local/bin"
   ];
 
-  home.stateVersion = "25.05";
-
   # File manager(nautilus) / file chooser bookmarks under GTK file dialogs
   gtk.gtk3.bookmarks = [
-    "file:///home/js0ny/Academia Academia"
-    "file:///home/js0ny/Atelier Atelier"
-    "file:///home/js0ny/Downloads Downloads"
+    "file:///home/${username}/Academia Academia"
+    "file:///home/${username}/Atelier Atelier"
+    "file:///home/${username}/Downloads Downloads"
   ];
 
   xdg.terminal-exec = {
@@ -142,4 +146,6 @@
       ];
     };
   };
+
+  home.stateVersion = "25.05";
 }