diff --git a/modules/home-manager/emacs/default.nix b/modules/home-manager/emacs/default.nix
index 6457458..19d2e0b 100644
--- a/modules/home-manager/emacs/default.nix
+++ b/modules/home-manager/emacs/default.nix
@@ -20,6 +20,7 @@ in
 	typescript-language-server
 	typescript
 	vscode-langservers-extracted
+	tailwindcss-language-server
 	nodejs
 	nixd
 
diff --git a/modules/home-manager/emacs/init.el b/modules/home-manager/emacs/init.el
index 53280be..8a2a7a0 100644
--- a/modules/home-manager/emacs/init.el
+++ b/modules/home-manager/emacs/init.el
@@ -63,7 +63,7 @@
 (use-package modus-themes
   :ensure t
   :config
-  (load-theme 'modus-vivendi t))
+  (load-theme 'modus-operandi t))
 
 (use-package doom-modeline
   :ensure t
@@ -119,8 +119,9 @@
 (use-package orderless
   :ensure t
   :config
-  (setq completion-styles '(orderless basic))
-  (setq completion-category-overrides '((file (styles partial-completion))))
+  (setq completion-styles '(orderless partial-completion basic))
+  ;; (setq completion-category-overrides '((file (styles partial-completion))))
+  (setq completion-category-overrides nil)
   (setq completion-category-defaults nil)
   (setq completion-pcm-leading-wildcard t))
 
@@ -221,8 +222,7 @@
   :ensure t
   :defer t
   :hook ((nix-ts-mode . eglot-ensure)
-		 (go-ts-mode . eglot-ensure)
-		 (typescript-ts-mode . eglot-ensure)))
+		 (go-ts-mode . eglot-ensure)))
 
 (use-package eglot-booster
   :ensure t
@@ -459,18 +459,35 @@
   :config
   (global-diff-hl-mode))
 
+;; LSP Mode
+(use-package lsp-mode
+  :ensure t
+  :init
+  (setq lsp-keymap-prefix "C-c l")
+  (defun my/lsp-mode-setup-completion ()
+	(setf (alist-get 'styles (alist-get 'lsp-capf completion-category-defaults))
+		  '(orderless)))
+  :hook ((typescript-ts-mode . lsp)
+         (tsx-ts-mode . lsp)
+         (js-ts-mode . lsp)
+         ;; if you want which-key integration
+         (lsp-mode . lsp-enable-which-key-integration)
+		 (lsp-completion-mode . my/lsp-mode-setup-completion))
+  :commands lsp
+  :config
+  (setq lsp-eslint-server-command '("vscode-eslint-language-server" "--stdio"))
+  (lsp-register-client
+   (make-lsp-client
+	:new-connection (lsp-stdio-connection '("tailwindcss-language-server" "--stdio"))
+	:activation-fn (lsp-activate-on "typescriptreact" "typescript" "css" "html")
+	:add-on? t
+	:notification-handlers (ht ("@/tailwindCSS/projectInitialized" #'ignore)
+							   ("@/tailwindCSS/projectsDestroyed" #'ignore)))))
+
+(use-package lsp-ui
+  :ensure t
+  :commands lsp-ui-mode
+  :config
+  (setq lsp-ui-sideline-enable nil))
+
 (provide 'init)
-(custom-set-variables
- ;; custom-set-variables was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(custom-safe-themes
-   '("77f281064ea1c8b14938866e21c4e51e4168e05db98863bd7430f1352cab294a"
-	 default)))
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- )
diff --git a/modules/home-manager/nixcats/init.lua b/modules/home-manager/nixcats/init.lua
index 6aa2fc4..2a39c6e 100644
--- a/modules/home-manager/nixcats/init.lua
+++ b/modules/home-manager/nixcats/init.lua
@@ -170,7 +170,7 @@ vim.keymap.set('n', "<leader><leader>s", function() Snacks.picker.buffers() end,
 -- find
 vim.keymap.set('n', "<leader>ff", function() Snacks.picker.files() end, { desc = "Find Files" })
 -- Grep
-vim.keymap.set('n', "<leader>fg", function() Snacks.picker.grep() end, { desc = "Grep" })
+vim.keymap.set('n', "<leader>fg", function() Snacks.picker.grep({ hidden = true }) end, { desc = "Grep" })
 -- search
 vim.keymap.set('n', "<leader>fd", function() Snacks.picker.diagnostics() end, { desc = "Diagnostics" })
 vim.keymap.set('n', "<leader>fh", function() Snacks.picker.help() end, { desc = "Help Pages" })