diff --git a/nvim/.luarc.json b/nvim/.luarc.json
new file mode 100644
index 0000000..972d0f6
--- /dev/null
+++ b/nvim/.luarc.json
@@ -0,0 +1,12 @@
+{
+  "runtime": {
+    "version": "LuaJIT"
+  },
+  "diagnostics": {
+    "globals": ["vim", "LazyVim", "Snacks"]
+  },
+  "workspace": {
+    "library": ["${3rd}/luv/library"],
+    "checkThirdParty": false
+  }
+}
\ No newline at end of file
diff --git a/nvim/lazyvim.json b/nvim/lazyvim.json
index e375555..8d59136 100644
--- a/nvim/lazyvim.json
+++ b/nvim/lazyvim.json
@@ -1,6 +1,5 @@
 {
   "extras": [
-    "lazyvim.plugins.extras.ai.claudecode",
     "lazyvim.plugins.extras.coding.mini-surround",
     "lazyvim.plugins.extras.dap.core",
     "lazyvim.plugins.extras.dap.nlua",
diff --git a/nvim/lua/config/options.lua b/nvim/lua/config/options.lua
index 3ea1454..72b50db 100644
--- a/nvim/lua/config/options.lua
+++ b/nvim/lua/config/options.lua
@@ -1,3 +1,6 @@
 -- Options are automatically loaded before lazy.nvim startup
 -- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua
 -- Add any additional options here
+vim.opt.tabstop = 4
+vim.opt.shiftwidth = 4
+vim.opt.softtabstop = 4
diff --git a/nvim/lua/plugins/claudecode.lua b/nvim/lua/plugins/claudecode.lua
index 95bc04a..8233edd 100644
--- a/nvim/lua/plugins/claudecode.lua
+++ b/nvim/lua/plugins/claudecode.lua
@@ -1,35 +1,64 @@
 return {
-  {
-    "coder/claudecode.nvim",
-    dependencies = { "folke/snacks.nvim" },
-    opts = {
-      terminal = {
-        split_width_percentage = 0.99,
-        snacks_win_opts = {
-          relative = "win",
-          position = "bottom",
-          height = 0.30,
-        },
-      },
-    },
-    keys = {
-      { "<leader>a", nil, desc = "AI/Claude Code" },
-      { "<leader>ac", "<cmd>ClaudeCode<cr>", desc = "Toggle Claude" },
-      { "<leader>af", "<cmd>ClaudeCodeFocus<cr>", desc = "Focus Claude" },
-      { "<leader>ar", "<cmd>ClaudeCode --resume<cr>", desc = "Resume Claude" },
-      { "<leader>aC", "<cmd>ClaudeCode --continue<cr>", desc = "Continue Claude" },
-      { "<leader>am", "<cmd>ClaudeCodeSelectModel<cr>", desc = "Select Claude model" },
-      { "<leader>ab", "<cmd>ClaudeCodeAdd %<cr>", desc = "Add current buffer" },
-      { "<leader>as", "<cmd>ClaudeCodeSend<cr>", mode = "v", desc = "Send to Claude" },
-      {
-        "<leader>as",
-        "<cmd>ClaudeCodeTreeAdd<cr>",
-        desc = "Add file",
-        ft = { "NvimTree", "neo-tree", "oil", "minifiles", "netrw" },
-      },
-      -- Diff management
-      { "<leader>aa", "<cmd>ClaudeCodeDiffAccept<cr>", desc = "Accept diff" },
-      { "<leader>ad", "<cmd>ClaudeCodeDiffDeny<cr>", desc = "Deny diff" },
-    },
-  },
+	{
+		"coder/claudecode.nvim",
+		dependencies = { "folke/snacks.nvim" },
+		opts = {
+			terminal = {
+				provider = "snacks",
+				snacks_win_opts = {
+					relative = "win",
+					position = "bottom",
+					height = 0.3,
+					split_width_percentage = 0.99,
+				},
+			},
+			diff_opts = {
+				layout = "vertical",
+				open_in_new_tab = true,
+				keep_terminal_focus = true,
+			},
+		},
+		keys = {
+			{ "<leader>a", "", desc = "+ai", mode = { "n", "v" } },
+			{ "<leader>ac", "<cmd>ClaudeCode<cr>", desc = "Toggle Claude" },
+			{ "<leader>af", "<cmd>ClaudeCodeFocus<cr>", desc = "Focus Claude" },
+			{ "<leader>ar", "<cmd>ClaudeCode --resume<cr>", desc = "Resume Claude" },
+			{ "<leader>aC", "<cmd>ClaudeCode --continue<cr>", desc = "Continue Claude" },
+			{ "<leader>ab", "<cmd>ClaudeCodeAdd %<cr>", desc = "Add current buffer" },
+			{ "<leader>as", "<cmd>ClaudeCodeSend<cr>", mode = "v", desc = "Send to Claude" },
+			{
+				"<leader>as",
+				"<cmd>ClaudeCodeTreeAdd<cr>",
+				desc = "Add file",
+				ft = { "NvimTree", "neo-tree", "oil" },
+			},
+			-- Diff management
+			{ "<leader>aa", "<cmd>ClaudeCodeDiffAccept<cr>", desc = "Accept diff" },
+			{ "<leader>ad", "<cmd>ClaudeCodeDiffDeny<cr>", desc = "Deny diff" },
+		},
+	},
+
+	-- Disabled: unmaintained
+	{
+		"greggh/claude-code.nvim",
+		enabled = false,
+		dependencies = { "nvim-lua/plenary.nvim" },
+		opts = {
+			position = "float",
+			float_opts = {
+				relative = "win",
+				width = "80%",
+				height = "80%",
+				row = "center",
+				col = "center",
+				border = "rounded",
+			},
+		},
+		keys = {
+			{ "<leader>a", nil, desc = "AI/Claude Code" },
+			{ "<leader>ac", "<cmd>ClaudeCode<cr>", desc = "Toggle Claude" },
+			{ "<leader>ar", "<cmd>ClaudeCodeResume<cr>", desc = "Resume Claude" },
+			{ "<leader>aC", "<cmd>ClaudeCodeContinue<cr>", desc = "Continue Claude" },
+		},
+	},
 }
diff --git a/nvim/lua/plugins/colorscheme.lua b/nvim/lua/plugins/colorscheme.lua
index 056606b..b1a39ea 100644
--- a/nvim/lua/plugins/colorscheme.lua
+++ b/nvim/lua/plugins/colorscheme.lua
@@ -1,37 +1,37 @@
 return {
-  {
-    "nyoom-engineering/oxocarbon.nvim",
-    lazy = false,
-    priority = 1000,
-    config = function()
-      vim.opt.background = "dark"
-      vim.cmd("colorscheme oxocarbon")
-    end,
-  },
-  {
-    "sainnhe/sonokai",
-    opts = {
-      sonokai_style = "atlantis",
-      sonokai_transparent_background = 1,
-      sonokai_enable_italic = true,
-    },
-  },
-  {
-    "folke/tokyonight.nvim",
-    opts = {
-      style = "night",
-      transparent = true,
-      styles = { comments = { italic = true } },
-    },
-  },
-  {
-    "loctvl842/monokai-pro.nvim",
-    opts = {
-      transparent_background = true,
-      filter = "spectrum",
-    },
-  },
-  { "scottmckendry/cyberdream.nvim" },
-  { "maxmx03/fluoromachine.nvim" },
-  { "rafamadriz/neon" },
+	{
+		"nyoom-engineering/oxocarbon.nvim",
+		lazy = false,
+		priority = 1000,
+		config = function()
+			vim.opt.background = "dark"
+			vim.cmd("colorscheme oxocarbon")
+		end,
+	},
+	{
+		"sainnhe/sonokai",
+		opts = {
+			sonokai_style = "atlantis",
+			sonokai_transparent_background = 1,
+			sonokai_enable_italic = true,
+		},
+	},
+	{
+		"folke/tokyonight.nvim",
+		opts = {
+			style = "night",
+			transparent = true,
+			styles = { comments = { italic = true } },
+		},
+	},
+	{
+		"loctvl842/monokai-pro.nvim",
+		opts = {
+			transparent_background = true,
+			filter = "spectrum",
+		},
+	},
+	{ "scottmckendry/cyberdream.nvim" },
+	{ "maxmx03/fluoromachine.nvim" },
+	{ "rafamadriz/neon" },
 }
diff --git a/nvim/lua/plugins/snacks.lua b/nvim/lua/plugins/snacks.lua
index 249c0e7..638a05b 100644
--- a/nvim/lua/plugins/snacks.lua
+++ b/nvim/lua/plugins/snacks.lua
@@ -1,13 +1,13 @@
 return {
-  {
-    "snacks.nvim",
-    opts = {
-      dashboard = {
-        preset = {
-          pick = function(cmd, opts)
-            return LazyVim.pick(cmd, opts)()
-          end,
-          header = [[
+	{
+		"snacks.nvim",
+		opts = {
+			dashboard = {
+				preset = {
+					pick = function(cmd, opts)
+						return LazyVim.pick(cmd, opts)()
+					end,
+					header = [[
           ███████╗████████╗██████╗ 
           ██╔════╝╚══██╔══╝██╔══██╗
           ███████╗   ██║   ██████╔╝
@@ -16,7 +16,6 @@ return {
           ╚══════╝   ╚═╝   ╚═╝     
   ]],
           -- stylua: ignore
-          ---@type snacks.dashboard.Item[]
           keys = {
             { icon = " ", key = "f", desc = "Find File", action = ":lua Snacks.dashboard.pick('files')" },
             { icon = " ", key = "n", desc = "New File", action = ":ene | startinsert" },
@@ -28,8 +27,8 @@ return {
             { icon = "󰒲 ", key = "l", desc = "Lazy", action = ":Lazy" },
             { icon = " ", key = "q", desc = "Quit", action = ":qa" },
           },
-        },
-      },
-    },
-  },
+				},
+			},
+		},
+	},
 }
diff --git a/nvim/lua/plugins/vimade.lua b/nvim/lua/plugins/vimade.lua
index 3c78b84..3f78b72 100644
--- a/nvim/lua/plugins/vimade.lua
+++ b/nvim/lua/plugins/vimade.lua
@@ -1,13 +1,13 @@
 return {
-  "TaDaa/vimade",
-  event = "WinNew",
-  opts = {
-    recipe = { "minimalist", { animate = true } },
-    fadelevel = 0.8,
-    blocklist = {
-      claude_terminal = {
-        buf_opts = { ft = "snacks_terminal" },
-      },
-    },
-  },
+	"TaDaa/vimade",
+	event = "WinNew",
+	opts = {
+		recipe = { "minimalist", { animate = true } },
+		fadelevel = 0.6,
+		blocklist = {
+			claude_terminal = {
+				buf_opts = { ft = "snacks_terminal" },
+			},
+		},
+	},
 }
diff --git a/nvim/stylua.toml b/nvim/stylua.toml
deleted file mode 100644
index 5d6c50d..0000000
--- a/nvim/stylua.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_type = "Spaces"
-indent_width = 2
-column_width = 120
\ No newline at end of file