diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index e74c2e7..e5ba039 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -1,7 +1,12 @@
 -- Initialize core settings first
 require("config.options")
+require("config.keymaps")
 
 -- Load plugin manager
 require("config.lazy")
 
+-- Plugin settings
+require("config.plugins.treesitter")
+
 -- Configure UI components last
+require("config.theme")
diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua
new file mode 100644
index 0000000..3ee3c34
--- /dev/null
+++ b/.config/nvim/lua/config/keymaps.lua
@@ -0,0 +1,2 @@
+vim.g.mapleader = " "
+vim.g.maplocalleader = "\\"
diff --git a/.config/nvim/lua/config/lazy.lua b/.config/nvim/lua/config/lazy.lua
index ae2b6bf..348a087 100644
--- a/.config/nvim/lua/config/lazy.lua
+++ b/.config/nvim/lua/config/lazy.lua
@@ -15,12 +15,6 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then
 end
 vim.opt.rtp:prepend(lazypath)
 
--- Make sure to setup `mapleader` and `maplocalleader` before
--- loading lazy.nvim so that mappings are correct.
--- This is also a good place to setup other settings (vim.opt)
-vim.g.mapleader = " "
-vim.g.maplocalleader = "\\"
-
 -- Setup lazy.nvim
 require("lazy").setup({
   spec = {
diff --git a/.config/nvim/lua/config/plugins/treesitter.lua b/.config/nvim/lua/config/plugins/treesitter.lua
new file mode 100644
index 0000000..7d15dcc
--- /dev/null
+++ b/.config/nvim/lua/config/plugins/treesitter.lua
@@ -0,0 +1,22 @@
+-- treesitter.lua
+require('nvim-treesitter.configs').setup {
+  -- Install these parsers by default
+  ensure_installed = { 
+    "lua", "vim", "vimdoc", "javascript", "typescript", "python", "rust", 
+    "go", "html", "css", "json", "yaml", "toml", "markdown", "bash" 
+  },
+  auto_install = true, -- Automatically install missing parsers
+  highlight = {
+    enable = true,
+    additional_vim_regex_highlighting = false,
+  },
+  indent = { enable = true },
+  incremental_selection = {
+    enable = true,
+    keymaps = {
+      init_selection = "<CR>",
+      node_incremental = "<CR>",
+      node_decremental = "<BS>",
+    },
+  },
+}
diff --git a/.config/nvim/lua/config/theme.lua b/.config/nvim/lua/config/theme.lua
new file mode 100644
index 0000000..8cd1baa
--- /dev/null
+++ b/.config/nvim/lua/config/theme.lua
@@ -0,0 +1,2 @@
+-- theme.lua
+vim.cmd[[colorscheme deus]]