diff --git a/config/colorscheme.nix b/config/colorscheme.nix
index 8433717..a6b4a74 100644
--- a/config/colorscheme.nix
+++ b/config/colorscheme.nix
@@ -1,24 +1,5 @@
-{lib, ...}:{
-  # TODO: Make colorscheme configurable
-  colorscheme = lib.mkOverride 500 "everforest";
-
+{
   colorschemes = {
-    kanagawa.enable = true;
-    nord.enable = true;
-    tokyonight = {
-      enable = true;
-      settings = {
-        style = "storm";
-        light_style = "day";
-        transparent = false;
-      };
-    };
-    everforest = {
-      enable = true;
-      settings = {
-        enable_italic = 1;
-      };
-    };
     catppuccin = {
       enable = true;
 
@@ -27,13 +8,6 @@
 
         # Needed to keep terminal transparency, if any
         transparent_background = false;
-
-        styles = {
-          keywords = [ "italic" ];
-          conditionals = [ "italic" ];
-          functions = [ "italic" ];
-          loops = [ "italic" ];
-        };
       };
     };
   };
diff --git a/config/default.nix b/config/default.nix
index c794b51..a19604a 100644
--- a/config/default.nix
+++ b/config/default.nix
@@ -9,6 +9,5 @@ let
       )
       (builtins.readDir ./.)
   );
-in {
-  imports = map (file: import ./${file}) definitions;
-}
+in
+lib.mkMerge (map (file: import ./${file}) definitions)
diff --git a/config/keymaps/default.nix b/config/keymaps/default.nix
index 2d161d8..4fb1a61 100644
--- a/config/keymaps/default.nix
+++ b/config/keymaps/default.nix
@@ -1,4 +1,4 @@
-_: {
+{
   keymaps =
     (import ./buffers.nix)
     ++ (import ./diagnostics.nix)
diff --git a/config/options.nix b/config/options.nix
index fd6ec50..6170bdc 100644
--- a/config/options.nix
+++ b/config/options.nix
@@ -1,7 +1,7 @@
 # Neovim options
 # Use :options to get the list of all options
 # Use :h <option> to load help for given <option>
-_:{
+{
   opts = {
     # Don't stop backspace at insert
     backspace.__raw = ''
diff --git a/plugins/aerial/default.nix b/plugins/aerial/default.nix
deleted file mode 100644
index 8da602b..0000000
--- a/plugins/aerial/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ lib, pkgs, ...}:
-{
-  extra = {
-    packages = [
-      (import ./package.nix { inherit lib pkgs; })
-    ];
-
-    config = ''
-      require("aerial").setup({
-        backends = { "lsp", "treesitter", "markdown", "man" },
-        layout = { min_width = 28, placement = "edge" },
-        show_guides = true,
-        filter_kind = false,
-
-        guides = {
-          mid_item = "├ ",
-          last_item = "└ ",
-          nested_top = "│ ",
-          whitespace = "  ",
-        },
-        autojump = true,
-        keymaps = {
-          ["[y"] = "actions.prev",
-          ["]y"] = "actions.next",
-          ["[Y"] = "actions.prev_up",
-          ["]Y"] = "actions.next_up",
-          ["{"] = false,
-          ["}"] = false,
-          ["[["] = false,
-          ["]]"] = false,
-        },
-        attach_mode = "global",
-      })
-    '';
-  };
-
-  rootOpts.keymaps = [
-    {
-      mode = "n";
-      key = "<leader>lo";
-      action.__raw = ''function() require("aerial").toggle() end'';
-      options.desc = "Symbols outline";
-    }
-    {
-      mode = "n";
-      key = "<leader>fs";
-      action.__raw = ''require("telescope").extensions.aerial.aerial'';
-      options.desc = "Find symbols";
-    }
-  ];
-}
diff --git a/plugins/aerial/package.nix b/plugins/aerial/package.nix
deleted file mode 100644
index 826cb31..0000000
--- a/plugins/aerial/package.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ pkgs, ...}:
-let 
-  version = "2.1.0";
-in
-pkgs.vimUtils.buildVimPlugin {
-  inherit version;
-
-  name = "aerial";
-
-  # src = pkgs.fetchFromGitHub {
-  #   owner = "stevearc";
-  #   repo = "aerial.nvim";
-  #   rev = "v${version}";
-  #   hash = "sha256:0ip8xmncp82svlbkphlas88xjvzrpzyy5b1c9x06dqbm4ifai0va";
-  # };
-
-  src = builtins.fetchTarball {
-    url = "http://github.com/stevearc/aerial.nvim/archive/v2.1.0.tar.gz";
-    sha256 = "sha256:0ip8xmncp82svlbkphlas88xjvzrpzyy5b1c9x06dqbm4ifai0va";
-  };
-}
diff --git a/plugins/arrow.nix b/plugins/arrow.nix
index 6899cba..6e7401c 100644
--- a/plugins/arrow.nix
+++ b/plugins/arrow.nix
@@ -11,13 +11,6 @@
         leader_key = ';', -- Recommended to be a single key
         buffer_leader_key = 'm', -- Per Buffer Mappings
       })
-      
-      -- prewritten for later
-      -- require("which-key").add({
-        -- {";", desc = "Arrow buffers"},
-        -- {"m", desc = "Arrow marks"}
-      -- })
     '';
   };
-
 }
diff --git a/plugins/committia.nix b/plugins/committia.nix
deleted file mode 100644
index 99e7486..0000000
--- a/plugins/committia.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-_:
-{
-  opts.enable = true;
-}
diff --git a/plugins/heirline.nix b/plugins/heirline.nix
index 42056e7..3b57cdd 100644
--- a/plugins/heirline.nix
+++ b/plugins/heirline.nix
@@ -8,7 +8,7 @@
     # Config from AstroNvim
     # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/heirline.lua
     # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/configs/heirline.lua
-    config = /*lua*/ ''
+    config = ''
       local status = require("astroui.status")
 
       require("heirline").setup({
diff --git a/plugins/lsp.nix b/plugins/lsp.nix
index 7e26c5c..1c8b15f 100644
--- a/plugins/lsp.nix
+++ b/plugins/lsp.nix
@@ -36,10 +36,10 @@
           action = "rename";
           desc = "Rename current symbol";
         };
-        # "<leader>lR" = {
-        #   action = "references";
-        #   desc = "Search references";
-        # };
+        "<leader>lR" = {
+          action = "rename";
+          desc = "Search references";
+        };
         "<leader>lh" = {
           action = "signature_help";
           desc = "Signature help";
diff --git a/plugins/luasnip.nix b/plugins/luasnip.nix
index 5f97d0a..613d852 100644
--- a/plugins/luasnip.nix
+++ b/plugins/luasnip.nix
@@ -6,19 +6,4 @@ _:{
       { paths = "~/.config/snippets/"; }
     ];
   };
-
-  rootOpts.keymaps = [
-    {
-      mode = "i";
-      key = "<C-g>";
-      action.__raw = ''function() require("luasnip").jump(1) end'';
-      options.desc = "Jump to next snippet node";
-    }
-    {
-      mode = "i";
-      key = "<C-h>";
-      action.__raw = ''function() require("luasnip").jump(-1) end'';
-      options.desc = "Jump to previous snippet node";
-    }
-  ];
 }
diff --git a/plugins/none-ls.nix b/plugins/none-ls.nix
deleted file mode 100644
index 99e7486..0000000
--- a/plugins/none-ls.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-_:
-{
-  opts.enable = true;
-}
diff --git a/plugins/telescope.nix b/plugins/telescope.nix
index fb7482e..d15a11b 100644
--- a/plugins/telescope.nix
+++ b/plugins/telescope.nix
@@ -104,7 +104,7 @@
         }
         {
           desc = "Find words";
-          key = "<leader>fw";
+          key = "<leader>fg";
           fn = "live_grep";
         }
         {
@@ -147,31 +147,15 @@
           key = "<leader>fC";
           fn = "commands";
         }
-        {
-          desc = "Find man";
-          key = "<leader>fm";
-          fn = "man_pages";
-        }
-        {
-          desc = "Find words in all files";
-          key = "<leader>fm";
-          fn = "live_grep";
-          args.additional_args.__raw = ''function(args) return vim.list_extend(args, { "--hidden", "--no-ignore" }) end'';
-        }
         {
           desc = "Find themes";
           key = "<leader>ft";
-          fn = "colorscheme";
+          fn = "colortheme";
           args = {
             enable_preview = true; 
             ignore_builtins = true;
           };
         }
-        {
-          desc = "Search diagnostics";
-          key = "<leader>lD";
-          fn = "diagnostics";
-        }
       ];
   };
 }
diff --git a/plugins/treesitter.nix b/plugins/treesitter.nix
index 946f361..d88603b 100644
--- a/plugins/treesitter.nix
+++ b/plugins/treesitter.nix
@@ -8,12 +8,7 @@
     enable = true;
 
     # Enable treesitter based indentation (use '=' to auto-indent)
-    settings = {
-      indent.enable = true;
-      highlight = {
-        enable = true;
-      };
-    };
+    settings.indent.enable = true;
 
     # Workaround to enable incremental selection without setting default keymaps (keymaps are set globally)
     # This is needed in order to set custom descriptions and avoid to have multiple keymaps
@@ -38,7 +33,7 @@
       }
       {
         mode = [ "n" "x" "o" ];
-        key = "-";
+        key = ";";
         action.__raw = "function() require('nvim-treesitter.textobjects.repeatable_move').repeat_last_move_opposite() end";
         options.desc = "Repeat last move in the opposite direction";
       }
diff --git a/plugins/which-key.nix b/plugins/which-key.nix
index 6126a05..f87790f 100644
--- a/plugins/which-key.nix
+++ b/plugins/which-key.nix
@@ -27,8 +27,6 @@
       "<leader>s".name = "${icons.Session} Session";
       "<leader>t".name = "${icons.Terminal} Terminal";
       "<leader>u".name = "${icons.Window} UI/UX";
-      ";".name = "Arrow buffers"; # This should move to arrow.nix when moving to which-key.add()
-      "m".name = "Arrow marks"; # This should move to arrow.nix when moving to which-key.add(
     };
   };
 
diff --git a/utils/_icons.nix b/utils/_icons.nix
index 52d8ed6..97845ba 100644
--- a/utils/_icons.nix
+++ b/utils/_icons.nix
@@ -41,8 +41,7 @@
   GitSign = "▎";
   GitStaged = "✓";
   GitUnstaged = "✗";
-  GitUntracked.__raw = "require('astroui').get_icon('GitUntracked')"; # TODO: this should be all the signs (or even a function)
-  # GitUntracked = "★";
+  GitUntracked = "★";
   LSPLoading1 = "";
   LSPLoading2 = "󰀚";
   LSPLoading3 = "";