diff --git a/after/plugin/lsp.lua b/after/plugin/lsp.lua
index f7f8444..a9cf565 100644
--- a/after/plugin/lsp.lua
+++ b/after/plugin/lsp.lua
@@ -17,6 +17,10 @@ local cmp_mapping = lsp.defaults.cmp_mappings({
     ["<C-Space>"] = cmp.mapping.complete(),
 })
 
+-- Hitting tab should indent, not complete
+cmp_mapping["<Tab>"] = nil
+cmp_mapping["<S-Tab>"] = nil
+
 lsp.setup_nvim_cmp({ mapping = cmp_mapping })
 
 vim.diagnostic.config({
diff --git a/after/plugin/treesitter.lua b/after/plugin/treesitter.lua
index b5c8389..d7dab31 100644
--- a/after/plugin/treesitter.lua
+++ b/after/plugin/treesitter.lua
@@ -1,5 +1,5 @@
 require("nvim-treesitter.configs").setup {
-    ensure_installed = { "rust", "lua", "javascript" },
+    ensure_installed = { "rust", "lua", "javascript", "typescript" },
 
     auto_install = true,
 
@@ -10,3 +10,7 @@ require("nvim-treesitter.configs").setup {
 }
 
 require("treesitter-context").setup()
+
+require("nvim-treesitter.configs").setup {
+    endwise = { enable = true }
+}
diff --git a/init.lua b/init.lua
index b83d9af..e821617 100644
--- a/init.lua
+++ b/init.lua
@@ -1,2 +1,3 @@
-require("valeth")
+require("valeth.options")
+require("valeth.keymaps")
 require("valeth.packer")
diff --git a/lua/valeth/init.lua b/lua/valeth/keymaps.lua
similarity index 67%
rename from lua/valeth/init.lua
rename to lua/valeth/keymaps.lua
index ef0b4e7..e70d0d3 100644
--- a/lua/valeth/init.lua
+++ b/lua/valeth/keymaps.lua
@@ -1,17 +1,3 @@
-vim.opt.number = true
-vim.opt.relativenumber = true
-vim.opt.expandtab = true
-vim.opt.shiftwidth = 4
-vim.opt.smartindent = true
-vim.opt.wrap = false
-vim.opt.incsearch = true
-vim.opt.termguicolors = true
-vim.opt.scrolloff = 8
-vim.opt.signcolumn = "yes"
-vim.opt.colorcolumn = "100"
-
-vim.g.mapleader = " "
-
 vim.keymap.set("n", "<Leader><CR>", "<cmd>noh<CR>")
 vim.keymap.set("n", "U", "<cmd>redo<CR>")
 vim.keymap.set("n", "Y", "y$")
diff --git a/lua/valeth/options.lua b/lua/valeth/options.lua
new file mode 100644
index 0000000..a74125d
--- /dev/null
+++ b/lua/valeth/options.lua
@@ -0,0 +1,13 @@
+vim.opt.number = true
+vim.opt.relativenumber = true
+vim.opt.expandtab = true
+vim.opt.shiftwidth = 4
+vim.opt.smartindent = true
+vim.opt.wrap = false
+vim.opt.incsearch = true
+vim.opt.termguicolors = true
+vim.opt.scrolloff = 8
+vim.opt.signcolumn = "yes"
+vim.opt.colorcolumn = "100"
+
+vim.g.mapleader = " "
diff --git a/lua/valeth/packer.lua b/lua/valeth/packer.lua
index 304b355..2168e36 100644
--- a/lua/valeth/packer.lua
+++ b/lua/valeth/packer.lua
@@ -169,6 +169,23 @@ local function spec(use)
         end
     }
 
+    use {
+        "windwp/nvim-autopairs",
+        config = function()
+            local cmp_autopairs = require("nvim-autopairs.completion.cmp")
+            local cmp = require("cmp")
+            require("nvim-autopairs").setup()
+            cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done())
+        end
+    }
+
+    use {
+        "RRethy/nvim-treesitter-endwise",
+        requires = {
+            { "nvim-treesitter/nvim-treesitter" },
+        }
+    }
+
 
     ---- Navigation