diff --git a/home-manager/common/software/cli/btop.nix b/home-manager/common/software/cli/btop.nix
index 1cab803e..843e51e4 100644
--- a/home-manager/common/software/cli/btop.nix
+++ b/home-manager/common/software/cli/btop.nix
@@ -1,8 +1,5 @@
 { ... }: {
   programs.btop = {
     enable = true;
-    settings = {
-      color_theme = "TTY";
-    };
   };
 }
diff --git a/home-manager/common/software/cli/nixvim/base.nix b/home-manager/common/software/cli/nixvim/base.nix
index be094e23..8051550d 100644
--- a/home-manager/common/software/cli/nixvim/base.nix
+++ b/home-manager/common/software/cli/nixvim/base.nix
@@ -196,39 +196,39 @@
         keymaps = {
           "<leader><leader>" = {
             action = "find_files";
-            desc = "Search files by name";
+            options.desc = "Search files by name";
           };
           "<leader>s" = {
             action = "live_grep";
-            desc = "Search by live grep";
+            options.desc = "Search by live grep";
           };
           "<leader>bl" = {
             action = "buffers";
-            desc = "[L]list open [B]uffers";
+            options.desc = "[L]list open [B]uffers";
           };
           "<leader>h" = {
             action = "help_tags";
-            desc = "Search [H]elp";
+            options.desc = "Search [H]elp";
           };
           "<leader>W" = {
             action = "grep_string";
-            desc = "Search for [W]ord under cursor";
+            options.desc = "Search for [W]ord under cursor";
           };
           "<leader>gs" = {
             action = "git_status";
-            desc = "Search [G]it [S]tatus";
+            options.desc = "Search [G]it [S]tatus";
           };
           "<leader>gl" = {
             action = "git_commits";
-            desc = "View [G]it [L]ogs";
+            options.desc = "View [G]it [L]ogs";
           };
           "<leader>r" = {
             action = "oldfiles";
-            desc = "Search [R]ecently opened files by name";
+            options.desc = "Search [R]ecently opened files by name";
           };
           "<leader>cs" = {
             action = "colorscheme";
-            desc = "Change [C]olor[s]cheme";
+            options.desc = "Change [C]olor[s]cheme";
           };
         };
       };
diff --git a/home-manager/common/software/cli/nixvim/cmp.nix b/home-manager/common/software/cli/nixvim/cmp.nix
index b1cfc3a2..fd9f9f47 100644
--- a/home-manager/common/software/cli/nixvim/cmp.nix
+++ b/home-manager/common/software/cli/nixvim/cmp.nix
@@ -10,6 +10,19 @@
     cmp-nvim-lsp-document-symbol.enable = true;
     cmp-nvim-lsp-signature-help.enable = true;
 
+    cmp.settings = {
+      sources = [
+        { name = "nvim_lua"; }
+        { name = "nvim_lsp"; }
+        { name = "calc"; }
+        { name = "path"; }
+        { name = "buffer"; }
+        { name = "luasnip"; }
+      ];
+      snippet.expand = "luasnip";
+ 
+    };
+
     nvim-cmp = {
       enable = true;
       autoEnableSources = true;
@@ -19,50 +32,28 @@
         "<C-e>" = "cmp.mapping.close()";
         "<C-f>" = "cmp.mapping.scroll_docs(4)";
         "<CR>"  = "cmp.mapping.confirm({ select = true })";
-        "<S-Tab>" = {
-          action = "cmp.mapping.select_prev_item()";
-          modes = [
-          "i"
-          "s"
-          ];
-        };
-        "<Tab>" = {
-          action = "cmp.mapping.select_next_item()";
-          modes = [
-          "i"
-          "s"
-          ];
-        };
+        "<S-Tab>" =  "cmp.mapping.select_prev_item()";
+        "<Tab>"   = "cmp.mapping.select_next_item()";
       };
-      sources = [
-        { name = "nvim_lua"; }
-        { name = "nvim_lsp"; }
-#        { name = "nvim_lsp_signature_help"; }
-        { name = "calc"; }
-        { name = "path"; }
-        { name = "buffer"; }
-        { name = "luasnip"; }
-      ];
-        snippet.expand = "luasnip";
-        window = {
-          completion.border = "rounded"; 
-          documentation.border = "rounded";
-        };
-        formatting = {
-          fields = [ "menu" "abbr" "kind" ];
-          # https://rsdlt.github.io/posts/rust-nvim-ide-guide-walkthrough-development-debug/
-          format = ''
-            function(entry, item)
-              local menu_icon = {
-                nvim_lsp = 'λ',
-                luasnip = '⋗',
-                buffer = 'Ω',
-                path = '🖫',
-              }
-              item.menu = menu_icon[entry.source.name]
-              return item
-            end,
-          '';
+      window = {
+        completion.border = "rounded"; 
+        documentation.border = "rounded";
+      };
+      formatting = {
+        fields = [ "menu" "abbr" "kind" ];
+        # https://rsdlt.github.io/posts/rust-nvim-ide-guide-walkthrough-development-debug/
+        format = ''
+          function(entry, item)
+            local menu_icon = {
+              nvim_lsp = 'λ',
+              luasnip = '⋗',
+              buffer = 'Ω',
+              path = '🖫',
+            }
+            item.menu = menu_icon[entry.source.name]
+            return item
+          end,
+        '';
       };
     };
   };