diff --git a/home/.chezmoiignore.tmpl b/home/.chezmoiignore.tmpl
index 192b00a..a4ab14e 100644
--- a/home/.chezmoiignore.tmpl
+++ b/home/.chezmoiignore.tmpl
@@ -69,8 +69,7 @@ vim:ft=gotmpl
     .config/rofi
     .config/waybar
     .config/ghostty
-    .config/zed/settings.json
-    .config/zed/keymap.json
+    .config/zed
     .config/starship.toml
     .config/aichat
     .config/libvirt
diff --git a/nixcfgs/modules/nixos/desktop/default.nix b/nixcfgs/modules/nixos/desktop/default.nix
index 2407071..f257ac6 100644
--- a/nixcfgs/modules/nixos/desktop/default.nix
+++ b/nixcfgs/modules/nixos/desktop/default.nix
@@ -49,8 +49,5 @@
     libnotify
     gnome-disk-utility
   ];
-
-  xdg.portal = {
-    wlr.enable = true;
-  };
+  xdg.terminal-exec.enable = true;
 }
diff --git a/nixcfgs/users/js0ny/default.nix b/nixcfgs/users/js0ny/default.nix
index f1bfc4e..806d934 100644
--- a/nixcfgs/users/js0ny/default.nix
+++ b/nixcfgs/users/js0ny/default.nix
@@ -19,8 +19,8 @@ in {
 
   programs.home-manager.enable = true;
 
-  xdg.configFile = {
-    "nixpkgs/config.nix".text = ''{ allowUnfree = true; }'';
+  nixpkgs.config = {
+    allowUnfree = true;
   };
   nix.package = pkgs.nix;
   nix.settings = {
diff --git a/nixcfgs/users/js0ny/packages/devtools.nix b/nixcfgs/users/js0ny/packages/devtools.nix
index 49a09e8..01cbaaa 100644
--- a/nixcfgs/users/js0ny/packages/devtools.nix
+++ b/nixcfgs/users/js0ny/packages/devtools.nix
@@ -14,6 +14,11 @@
     tokei
     socat
     shellcheck
+    bruno
+    bruno-cli
+    httpie
+    gron
+    jless
   ];
   home.sessionVariables = {
     CARGO_HOME = "${config.xdg.dataHome}/cargo";
diff --git a/nixcfgs/users/js0ny/packages/gui.nix b/nixcfgs/users/js0ny/packages/gui.nix
index 14c8ba0..c135515 100644
--- a/nixcfgs/users/js0ny/packages/gui.nix
+++ b/nixcfgs/users/js0ny/packages/gui.nix
@@ -1,6 +1,7 @@
 {
   pkgs,
   lib,
+  config,
   ...
 }: let
   # FIXME: This will block the desktop files
@@ -85,6 +86,7 @@ in {
       materialgram
       ayugram-desktop
       steam
+      adwsteamgtk
       signal-desktop
       # Use Wayland for Jetbrains
       # (jetbrains.idea-ultimate.override {
@@ -105,13 +107,10 @@ in {
       goldendict-ng
       kdePackages.kdenlive
       gimp
-      steam-run
       rustdesk
       remmina
       zotero
       feishin
-      bruno
-      bruno-cli
       kicad
       blender
       onlyoffice-desktopeditors
@@ -126,9 +125,9 @@ in {
       scanmem
       dex
       piliplus
-      foliate
       newsflash
       mission-center
+      calibre
     ]
     ++ (mkFcitxIM [
       pkgs.neovim-qt
@@ -171,4 +170,6 @@ in {
 
   services.protonmail-bridge.enable = true;
   services.remmina.enable = false; # Don't auto start the service
+
+  gtk.gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
 }
diff --git a/nixcfgs/users/js0ny/programs/desktop/gnome/copyous.nix b/nixcfgs/users/js0ny/programs/desktop/gnome/copyous.nix
index b7be862..41f7123 100644
--- a/nixcfgs/users/js0ny/programs/desktop/gnome/copyous.nix
+++ b/nixcfgs/users/js0ny/programs/desktop/gnome/copyous.nix
@@ -20,5 +20,8 @@ in {
       open-clipboard-dialog-shortcut = ["<Super>v"];
       show-at-pointer = true;
     };
+    "org/gnome/shell" = {
+      enabled-extensions = ["copyous@boerdereinar.dev"];
+    };
   };
 }
diff --git a/nixcfgs/users/js0ny/programs/desktop/gnome/default.nix b/nixcfgs/users/js0ny/programs/desktop/gnome/default.nix
index 35d7fe4..750812c 100644
--- a/nixcfgs/users/js0ny/programs/desktop/gnome/default.nix
+++ b/nixcfgs/users/js0ny/programs/desktop/gnome/default.nix
@@ -1,23 +1,21 @@
 {
   pkgs,
   config,
-  lib,
   ...
 }: let
   extensions = with pkgs.gnomeExtensions; [
-    # dash-to-dock
+    dash-to-dock
     caffeine
-    logo-menu
     kimpanel
     appindicator
     gsconnect
     advanced-alttab-window-switcher
     resource-monitor
     lunar-calendar
+    arcmenu
   ];
 in {
   imports = [
-    ../../walker.nix
     ./copyous.nix
   ];
   home.packages = with pkgs;
@@ -97,6 +95,7 @@ in {
     };
     "org/gnome/settings-daemon/plugins/media-keys" = {
       www = ["<Super>b"];
+      help = [""];
       home = ["<Super>e"];
       screenreader = [""];
       screensaver = [""];
@@ -108,25 +107,31 @@ in {
     };
     "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-1" = {
       name = "Open Terminal via Win-CR";
-      command = "${lib.getExe config.my.desktop.preferredApps.terminal.package}";
+      command = "xdg-terminal";
       binding = "<Super>Return";
     };
     "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-2" = {
       name = "Open Terminal via Ctrl-Alt-T";
-      command = "${lib.getExe config.my.desktop.preferredApps.terminal.package}";
+      command = "xdg-terminal";
       binding = "<Ctrl><Alt>t";
     };
-    "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-3" = {
-      name = "Open Picker";
-      command = "walker";
-      binding = "<Alt>space";
+    # "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-3" = {
+    #   name = "Open Picker";
+    #   command = "walker";
+    #   binding = "<Alt>space";
+    # };
+    "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-4" = {
+      name = "Open Obsidian";
+      command = "Obsidian";
+      binding = "<Super>O";
     };
     "org/gnome/settings-daemon/plugins/media-keys" = {
       custom-keybindings = [
         # "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-0/"
         "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-1/"
         "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-2/"
-        "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-3/"
+        # "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-3/"
+        "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-4/"
       ];
     };
     # Scanned directory in GNOME Search
@@ -137,7 +142,9 @@ in {
         "&MUSIC"
         "&PICTURES"
         "&VIDEOS"
-        "/home/js0ny/Obsidian"
+        "/home/${config.home.username}/Obsidian"
+        "/home/${config.home.username}/Atelier"
+        "/home/${config.home.username}/Academia"
       ];
     };
     "ca/desrt/dconf-editor" = {
@@ -169,5 +176,30 @@ in {
       ramunit = "perc";
       customleftclickstatus = "missioncenter";
     };
+    "org/gnome/shell/extensions/arcmenu" = {
+      "menu-button-icon" = "nix-snowflake-white";
+      "menu-button-icon-size" = 25;
+      "runner-hotkey" = ["<Alt>space"];
+    };
+    "org/gnome/shell/extensions/dash-to-dock" = {
+      # shortcut: Hit to focus the dock
+      # disable this behaviour as it conflicts with *QUIT*
+      # Default: <Super>Q
+      shortcut = [];
+      # scroll action: mouse scroll on dock icons
+      # Default: 'do-nothing
+      # Options: 'do-nothing', 'cycle-windows', 'switch-workspace'
+      scroll-action = "cycle-windows";
+      dock-position = "BOTTOM";
+    };
+    "org/gnome/shell/extensions/advanced-alttab-window-switcher" = {
+      # Show Hotkeys F1-F12 for Direct Activation
+      switcher-popup-hot-keys = true;
+      # Tooltip Titles:
+      # 1: Disabled
+      # 2: Show Above/Below Item (Default)
+      # 3: Show Centered
+      switcher-popup-tooltip-title = 3;
+    };
   };
 }
diff --git a/nixcfgs/users/js0ny/programs/desktop/gnome/paperwm.nix b/nixcfgs/users/js0ny/programs/desktop/gnome/paperwm.nix
index 6f1542b..6248093 100644
--- a/nixcfgs/users/js0ny/programs/desktop/gnome/paperwm.nix
+++ b/nixcfgs/users/js0ny/programs/desktop/gnome/paperwm.nix
@@ -44,6 +44,9 @@
       slurp-in = ["<Super>bracketleft"];
       barf-out = ["<Super>bracketright"];
       barf-out-active = [];
+      # Use AATWS
+      live-alt-tab = [];
+      live-alt-tab-backward = [];
     };
     "org/gnome/shell/extensions/paperwm" = {
       winprops = [''{"wm_class":"dev.benz.walker","scratch_layer":true}''];
diff --git a/nixcfgs/users/js0ny/programs/desktop/wayland-wm/niri/keymaps.nix b/nixcfgs/users/js0ny/programs/desktop/wayland-wm/niri/keymaps.nix
index 0a39730..70f8bf6 100644
--- a/nixcfgs/users/js0ny/programs/desktop/wayland-wm/niri/keymaps.nix
+++ b/nixcfgs/users/js0ny/programs/desktop/wayland-wm/niri/keymaps.nix
@@ -4,7 +4,7 @@
   lib,
   ...
 }: let
-  term = lib.getExe config.my.desktop.preferredApps.terminal.package;
+  term = "xdg-terminal-exec";
   # TODO: Don't default to dark
   iconTheme = config.my.desktop.style.iconTheme.dark;
   launcher = "walker";
diff --git a/nixcfgs/users/js0ny/zephyrus.nix b/nixcfgs/users/js0ny/zephyrus.nix
index 56fd017..7bd6f38 100644
--- a/nixcfgs/users/js0ny/zephyrus.nix
+++ b/nixcfgs/users/js0ny/zephyrus.nix
@@ -117,7 +117,7 @@
   };
 
   home.sessionVariables = {
-    TERMINAL = config.my.desktop.preferredApps.terminal.package;
+    TERMINAL = "xdg-terminal-exec";
     EDITOR = "nvim";
     VISUAL = "nvim";
   };
@@ -128,10 +128,19 @@
 
   home.stateVersion = "25.05";
 
-  # File manager(nautilus) / file chooser bookmarks
+  # 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"
   ];
+
+  xdg.terminal-exec = {
+    enable = true;
+    settings = {
+      default = [
+        "kitty.desktop"
+      ];
+    };
+  };
 }