diff --git a/home/base/cli-tools/fzf.nix b/home/base/cli-tools/fzf.nix
index 8939199..f4ef6af 100644
--- a/home/base/cli-tools/fzf.nix
+++ b/home/base/cli-tools/fzf.nix
@@ -31,7 +31,6 @@ in {
         "--preview='bat --color=always -n {}'"
         "--bind 'ctrl-/:toggle-preview'"
         "--header 'Press CTRL-Y to copy command into clipboard'"
-        "--bind 'ctrl-/:toggle-preview'"
         "--bind 'ctrl-y:execute-silent(echo -n {2..} | wl-copy)+abort'"
       ];
       defaultCommand = "fd --type f --exclude .git --follow --hidden";
diff --git a/home/base/shell/nushell.nix b/home/base/shell/nushell.nix
index 9616531..9bf837a 100644
--- a/home/base/shell/nushell.nix
+++ b/home/base/shell/nushell.nix
@@ -21,7 +21,7 @@ in {
         $env.EDITOR = "nvim"
         $env.VISUAL = "zeditor"
         $env.FZF_DEFAULT_COMMAND = "fd --type f --exclude .git --follow --hidden"
-        $env.FZF_DEFAULT_OPTS = "--preview='bat --color=always -n {}' --bind 'ctrl-/:toggle-preview' --header 'Press CTRL-Y to copy command into clipboard' --bind 'ctrl-/:toggle-preview' --bind 'ctrl-y:execute-silent(echo -n {2..} | wl-copy)+abort' --color bg:#282a36,bg+:#44475a,fg:#f8f8f2,fg+:#f8f8f2,header:#6272a4,hl:#bd93f9,hl+:#bd93f9,info:#ffb86c,marker:#ff79c6,pointer:#ff79c6,prompt:#50fa7b,spinner:#ffb86c"
+        $env.FZF_DEFAULT_OPTS = "--preview='bat --color=always -n {}' --bind 'ctrl-/:toggle-preview' --header 'Press CTRL-Y to copy command into clipboard' --bind 'ctrl-y:execute-silent(echo -n {2..} | wl-copy)+abort' --color bg:#282a36,bg+:#44475a,fg:#f8f8f2,fg+:#f8f8f2,header:#6272a4,hl:#bd93f9,hl+:#bd93f9,info:#ffb86c,marker:#ff79c6,pointer:#ff79c6,prompt:#50fa7b,spinner:#ffb86c"
         $env.XDG_DATA_HOME = $"($env.HOME)/.local/share"
         $env.SSH_AUTH_SOCK = "/run/user/1000/gnupg/S.gpg-agent.ssh"
         $env.PATH = ($env.PATH | split row (char esep) | append $"($env.HOME)/.cache/.bun/bin" | append $"($env.HOME)/.npm-global/bin" | uniq)
diff --git a/home/coding/agents/agents.nix b/home/coding/agents/agents.nix
index ca014a7..2945551 100644
--- a/home/coding/agents/agents.nix
+++ b/home/coding/agents/agents.nix
@@ -1,5 +1,6 @@
 # AI agent system — OpenCode, Pi, and MCP server configuration.
-# References inputs.m3ta-nixpkgs.homeManagerModules.coding.agents for the base module.
+# Relies on coding.agents options provided by home/common/default.nix
+# (inputs.m3ta-nixpkgs.homeManagerModules.default).
 {
   config,
   inputs,
diff --git a/home/coding/editor/default.nix b/home/coding/editor/default.nix
index 6c02d36..2f18bca 100644
--- a/home/coding/editor/default.nix
+++ b/home/coding/editor/default.nix
@@ -1,4 +1,4 @@
-# Editor aggregator — delegates to m3ta-nixpkgs editors module for NeoVim and Zed.
+# Editor aggregator — delegates to m3ta-nixpkgs editor modules.
 {...}: {
   imports = [
     ./neovim.nix
diff --git a/home/desktop/apps/webapps.nix b/home/desktop/apps/webapps.nix
index d731fb9..8c34b96 100644
--- a/home/desktop/apps/webapps.nix
+++ b/home/desktop/apps/webapps.nix
@@ -1,7 +1,7 @@
 # Web application desktop entries — Teams, Outlook, Basecamp, and OpenCode launchers.
 {
+  config,
   pkgs,
-  lib,
   ...
 }: let
   icons = {
@@ -42,7 +42,7 @@ in {
       comment = "Open Basecamp as a Desktop App";
       categories = ["Application" "Network"];
       terminal = false;
-      icon = "/home/sascha.koenig/.local/share/icons/basecamp-logo.png";
+      icon = "${config.home.homeDirectory}/.local/share/icons/basecamp-logo.png";
     };
     opencode = {
       name = "Opencode";
diff --git a/home/desktop/theme/wallpapers.nix b/home/desktop/theme/wallpapers.nix
index 24fd90c..2b8617d 100644
--- a/home/desktop/theme/wallpapers.nix
+++ b/home/desktop/theme/wallpapers.nix
@@ -5,9 +5,9 @@
   ...
 }:
 with lib; let
-  cfg = config.desktop.theme.wallpapers;
+  cfg = config.desktop.theme.wallpapers.enable;
 in {
-  options.desktop.theme.wallpapers = mkEnableOption "wallpapers for Hyprland";
+  options.desktop.theme.wallpapers.enable = mkEnableOption "wallpapers for Hyprland";
 
   config = mkIf cfg {
     xdg.configFile."hypr/wallpapers" = {