diff --git a/profiles/desktop/gnome/default.nix b/profiles/desktop/gnome/default.nix
index 3795d45..c44045b 100644
--- a/profiles/desktop/gnome/default.nix
+++ b/profiles/desktop/gnome/default.nix
@@ -35,11 +35,8 @@ https://wiki.nixos.org/wiki/GNOME
   # support GConf-based applications
   # services.dbus.packages = [ pkgs.gnome2.GConf ];
 
-  # Enable system tray icons (will also require the appindicator gnome-extension)
-  # environment.systemPackages = [ pkgs.gnomeExtensions.appindicator  ];
-  services.udev.packages = [
-    (pkgs.gnome-settings-daemon or pkgs.gnome.gnome-settings-daemon)
-  ];
+  # Enable system tray icons (used by gnomeExtensions.appindicator)
+  services.udev.packages = [ pkgs.gnome-settings-daemon ];
 
   # programs.dconf.profiles.user.databases = [
   #   {
@@ -64,19 +61,20 @@ https://wiki.nixos.org/wiki/GNOME
     pkgs.pavucontrol
     pkgs.lxterminal # TODO: remove?
     pkgs.ghostty
-    (pkgs.gnome-tweaks or pkgs.gnome.gnome-tweaks)
+
+    pkgs.gnome-tweaks
     pkgs.refine # Tweak various aspects of GNOME
-    # TODO: shadow gnome-terminal
+
     pkgs.ffmpegthumbnailer
     pkgs.libheif # HEIF thumbnails
     pkgs.gnomeExtensions.appindicator
 
-    pkgs.decibels
+    pkgs.decibels # audio player
     pkgs.dconf-editor
 
-    pkgs.loupe
-    pkgs.gnome-clocks
+    pkgs.loupe # eog replacement
     pkgs.shotwell # image editor
+    # pkgs.gnome-clocks
 
     pkgs.desktop-file-utils # update-desktop-database
   ];
@@ -97,23 +95,22 @@ https://wiki.nixos.org/wiki/GNOME
     pkgs.gnome-photos
     pkgs.gnome-tour
     pkgs.gnome-maps
-    (pkgs.gedit or pkgs.gnome.gedit) # text editor (24.05 vs 23.11)
+    pkgs.gedit # text editor (24.05 vs 23.11)
     # pkgs.papers # Document Viewer (new)
-    (pkgs.eog or pkgs.gnome.eog)
+    pkgs.eog
     #pkgs.cheese # webcam tool
     #pkgs.baobab # Disk Usage Analyser
-    (pkgs.simple-scan or pkgs.gnome.simple-scan) # scanning utility
-    (pkgs.yelp or pkgs.gnome.yelp) # Help
-    (pkgs.evince or pkgs.gnome.evince) # Document Viewer
-    (pkgs.gnome-music or pkgs.gnome.gnome-music)
-    (pkgs.gnome-terminal or pkgs.gnome.gnome-terminal)
-    (pkgs.epiphany or pkgs.gnome.epiphany) # web browser
-    (pkgs.geary or pkgs.gnome.geary) # email reader
-    (pkgs.totem or pkgs.gnome.totem) # video player
-    (pkgs.tali or pkgs.gnome.tali) # poker game
-    (pkgs.iagno or pkgs.gnome.iagno) # go game
-    (pkgs.hitori or pkgs.gnome.hitori) # sudoku game
-    (pkgs.atomix or pkgs.gnome.atomix) # puzzle game
+    pkgs.simple-scan # scanning utility
+    pkgs.yelp # Help
+    pkgs.gnome-music
+    pkgs.evince # Document Viewer
+    pkgs.epiphany # web browser
+    pkgs.geary # email reader
+    pkgs.totem # video player
+    pkgs.tali # poker game
+    pkgs.iagno # go game
+    pkgs.hitori # sudoku game
+    pkgs.atomix # puzzle game
   ];
 }
 
diff --git a/users/pbsds/home/profiles/desktop/ghostty/ghosty.config b/users/pbsds/home/profiles/desktop/ghostty/ghosty.config
index 2a15c5f..a358a45 100644
--- a/users/pbsds/home/profiles/desktop/ghostty/ghosty.config
+++ b/users/pbsds/home/profiles/desktop/ghostty/ghosty.config
@@ -23,14 +23,9 @@ clipboard-paste-bracketed-safe = true
 # 50MB, default is 10MB. The buffer is preallocated
 scrollback-limit = 50000000
 
+# navigation in micro
 keybind = ctrl+comma=unbind
 keybind = ctrl+shift+comma=unbind
-keybind = ctrl+shift+page_down=move_tab:+1
-keybind = ctrl+shift+page_up=move_tab:-1
-keybind = ctrl+shift+up=scroll_page_lines:-1
-keybind = ctrl+shift+down=scroll_page_lines:1
-keybind = ctrl+shift+left=unbind
-keybind = ctrl+shift+right=unbind
 #keybind = shift+page_up=unbind
 #keybind = shift+page_down=unbind
 #keybind = unconsumed:shift+page_up=scroll_page_up
@@ -40,3 +35,11 @@ keybind = shift+end=unbind
 keybind = ctrl+shift+q=unbind
 keybind = ctrl+enter=unbind
 keybind = ctrl+shift+enter=unbind
+
+# tab and view management
+keybind = ctrl+shift+page_down=move_tab:+1
+keybind = ctrl+shift+page_up=move_tab:-1
+keybind = ctrl+shift+up=scroll_page_lines:-1
+keybind = ctrl+shift+down=scroll_page_lines:1
+keybind = ctrl+shift+left=unbind
+keybind = ctrl+shift+right=unbind
diff --git a/users/pbsds/home/profiles/desktop/mpv.nix b/users/pbsds/home/profiles/desktop/mpv.nix
index d4d3ce1..7c7c3ff 100644
--- a/users/pbsds/home/profiles/desktop/mpv.nix
+++ b/users/pbsds/home/profiles/desktop/mpv.nix
@@ -1,8 +1,7 @@
 { lib, pkgs, config, ... }:
 
 let
-  m = pkgs.mpvScripts;
-  mu = pkgs.unstable.mpvScripts;
+  inherit (pkgs) mpvScripts;
   anime4k = pkgs.anime4k or pkgs.unstable.anime4k or null;
   a4k = lib.mkIf (anime4k != null);
 in
@@ -32,11 +31,12 @@ in
   programs.mpv.bindings."CTRL+6" = a4k ''no-osd change-list glsl-shaders set "${anime4k}/Anime4K_Clamp_Highlights.glsl:${anime4k}/Anime4K_Upscale_Denoise_CNN_x2_VL.glsl:${anime4k}/Anime4K_AutoDownscalePre_x2.glsl:${anime4k}/Anime4K_AutoDownscalePre_x4.glsl:${anime4k}/Anime4K_Restore_CNN_M.glsl:${anime4k}/Anime4K_Upscale_CNN_x2_M.glsl"; show-text "Anime4K: Mode C+A (HQ)"'';
   /**/
 
+
   programs.mpv.scripts = [
-    #m.thumbnail # TOO SLOW
-    m.thumbfast
-    m.mpris
-    (m.mpv-webm or mu.mpv-webm) # activate with SHIFT+W
+    #mpvScripts.thumbnail # TOO SLOW
+    mpvScripts.thumbfast
+    mpvScripts.mpris
+    mpvScripts.mpv-webm # activate with SHIFT+W
     # from https://github.com/mpv-player/mpv/issues/9767#issuecomment-1024831645
     ({ scriptName = "dynamic-subs.lua"; } // (pkgs.writeTextDir "share/mpv/scripts/dynamic-subs.lua" ''
       mp.add_hook('on_load', 10, function()