diff --git a/plugins/treesitter.nix b/plugins/treesitter.nix
index 5f5416e..c966506 100644
--- a/plugins/treesitter.nix
+++ b/plugins/treesitter.nix
@@ -21,8 +21,9 @@
     settings.incremental_selection = {
       enable = true;
       keymaps = lib.mkForce { };
-      highlight.enable = true;
     };
+    
+    settings.highlight.enable = true;
   };
 
   rootOpts = {
diff --git a/plugins/which-key.nix b/plugins/which-key.nix
index 6126a05..8215e8e 100644
--- a/plugins/which-key.nix
+++ b/plugins/which-key.nix
@@ -5,31 +5,48 @@
 {
   opts = {
     enable = true;
-    icons.group = "";
-    window.border = "single";
+
 
     # Disable which-key when in neo-tree or telescope
-    disable.filetypes = [
-      "TelescopePrompt"
-      "neo-tree"
-      "neo-tree-popup"
-    ];
 
-    # Customize section names (prefixed mappings)
-    registrations = {
-      "<leader>b".name = "${icons.Tab} Buffers";
-      "<leader>bs".name = "${icons.Sort} Sort Buffers";
-      "<leader>d".name = "${icons.Debugger} Debugger";
-      "<leader>f".name = "${icons.Search} Find";
-      "<leader>g".name = "${icons.Git} Git";
-      "<leader>l".name = "${icons.ActiveLSP} Language Tools";
-      "<leader>m".name = " Markdown";
-      "<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(
+    settings = {
+      icons.group = "";
+      window.border = "single";
+
+      # Customize section names (prefixed mappings)
+      spec = [
+        { __unkeyed = "<leader>b"; group = "Buffers"; icon = icons.Tab; }
+        { __unkeyed = "<leader>bs"; group = "Sort Buffers"; icon = icons.Sort;}
+        { __unkeyed = "<leader>d"; group = "Debugger"; icon = icons.Debugger;}
+        { __unkeyed = "<leader>f"; group = "Find"; icon = icons.Search;}
+        { __unkeyed = "<leader>g"; group = "Git"; icon = icons.Git;}
+        { __unkeyed = "<leader>l"; group = "Language Tools"; icon = icons.ActiveLSP;}
+        { __unkeyed = "<leader>m"; group = " Markdown"; }
+        { __unkeyed = "<leader>s"; group = "Session"; icon = icons.Session;}
+        { __unkeyed = "<leader>t"; group = "Terminal"; icon = icons.Terminal;}
+        { __unkeyed = "<leader>u"; group = "UI/UX"; icon = icons.Window;}
+      ];
+
+      disable.ft = [
+        "TelescopePrompt"
+        "neo-tree"
+        "neo-tree-popup"
+      ];
     };
+
+
+    # registrations = {
+    #   "<leader>b".name = "${icons.Tab} Buffers";
+    #   "<leader>bs".name = "${icons.Sort} Sort Buffers";
+    #   "<leader>d".name = "${icons.Debugger} Debugger";
+    #   "<leader>f".name = "${icons.Search} Find";
+    #   "<leader>g".name = "${icons.Git} Git";
+    #   "<leader>l".name = "${icons.ActiveLSP} Language Tools";
+    #   "<leader>m".name = " Markdown";
+    #   "<leader>s".name = "${icons.Session} Session";
+    #   "<leader>t".name = "${icons.Terminal} Terminal";
+    #   "<leader>u".name = "${icons.Window} UI/UX";
+    # };
   };
 
   # Enable catppuccin colors