diff --git a/.config/nvim/lua/config/filetypes.lua b/.config/nvim/lua/config/filetypes.lua
new file mode 100644
index 0000000..c717e0c
--- /dev/null
+++ b/.config/nvim/lua/config/filetypes.lua
@@ -0,0 +1,23 @@
+vim.api.nvim_create_autocmd('Filetype', {
+    pattern = {
+		'xml',
+		'html',
+		'xhtml',
+		'css',
+		'scss',
+		'javascript',
+		'typescript',
+		'lua',
+		'jsx',
+		'tsx',
+		'typescriptreact',
+		'javascriptreact',
+		'htmldjango'
+	},
+    command = 'setlocal shiftwidth=4 tabstop=4 expandtab'
+})
+vim.api.nvim_create_autocmd('Filetype', {
+    pattern = { 'yaml',
+	},
+    command = 'setlocal shiftwidth=2 tabstop=2 expandtab'
+})
diff --git a/.config/nvim/lua/config/treesitter.lua b/.config/nvim/lua/config/treesitter.lua
index 3ba99be..a857afc 100644
--- a/.config/nvim/lua/config/treesitter.lua
+++ b/.config/nvim/lua/config/treesitter.lua
@@ -34,4 +34,9 @@ require'nvim-treesitter.configs'.setup {
         -- Instead of true it can also be a list of languages
         additional_vim_regex_highlighting = false,
     },
+
+    -- indent with treesitter is currently experimental, just mark text and hit "="
+    indent = {
+        enable = true,
+    },
 }