diff --git a/editorconfig b/editorconfig
index 1e76b4d..d5e70ea 100644
--- a/editorconfig
+++ b/editorconfig
@@ -7,18 +7,12 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
-indent_size = 2
-indent_style = space
+indent_style = tab
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.{py,md,rst,sh,c,h}]
-indent_size = 4
-indent_style = space
-
 [*.{md,markdown,pandoc}]
 trim_trailing_whitespace = false
 
 [Makefile]
 indent_style = tab
-
diff --git a/nvim/lua/kogakure/autocommands.lua b/nvim/lua/kogakure/autocommands.lua
index 411f410..e62c67d 100644
--- a/nvim/lua/kogakure/autocommands.lua
+++ b/nvim/lua/kogakure/autocommands.lua
@@ -38,7 +38,6 @@ vim.cmd([[
     autocmd!
     autocmd FileType html,eruby,njk setlocal foldmethod=indent
     autocmd FileType html,eruby,njk setlocal omnifunc=htmlcomplete#CompleteTags
-    autocmd Filetype html,eruby,njk setlocal ts=2 sts=2 sw=2 expandtab
   augroup END
 
   augroup _ft_css
@@ -48,21 +47,18 @@ vim.cmd([[
     autocmd FileType css setlocal foldmarker={,}
     autocmd FileType css,scss,sass,less,stylus setlocal omnifunc=csscomplete#CompleteCSS
     autocmd Filetype css,scss,sass,less,stylus setlocal iskeyword+=-
-    autocmd Filetype css,scss,sass,less,stylus setlocal ts=2 sts=2 sw=2 expandtab
   augroup END
 
   augroup _ft_xml
     autocmd!
     autocmd FileType xml setlocal foldmethod=indent
     autocmd FileType xml set omnifunc=xmlcomplete#CompleteTags
-    autocmd Filetype xml setlocal ts=2 sts=2 sw=2 expandtab
   augroup END
 
   augroup _ft_javascript
     autocmd!
     autocmd FileType javascript setlocal foldmethod=indent
     autocmd FileType javascript setlocal omnifunc=javascriptcomplete#CompleteJS
-    autocmd FileType javascript setlocal ts=2 sts=2 sw=2 expandtab
     autocmd BufRead,BufNewFile *.es6 setfiletype javascript
     autocmd BufRead,BufNewFile *.jsx setfiletype javascript.jsx
   augroup END
diff --git a/nvim/lua/kogakure/options.lua b/nvim/lua/kogakure/options.lua
index fbca296..f2be25e 100644
--- a/nvim/lua/kogakure/options.lua
+++ b/nvim/lua/kogakure/options.lua
@@ -17,9 +17,9 @@ local options = {
 	grepprg = "rg\\ --vimgrep\\ --no-heading\\ --smart-case",
 	hidden = true,
 	ignorecase = true,
-	list = true,
+	list = false,
 	listchars = {
-		tab = "∙\\ ",
+		tab = "↦ ",
 		trail = "·",
 		nbsp = ".",
 		extends = "❯",
@@ -32,18 +32,18 @@ local options = {
 	relativenumber = true,
 	scrolloff = 8,
 	shiftround = true,
-	shiftwidth = 2,
+	shiftwidth = 4,
 	shortmess = "caoOtI", -- Welcome screen
 	showbreak = "↪",
 	sidescrolloff = 8,
 	signcolumn = "yes:2",
 	smartcase = true,
-	softtabstop = 2,
+	softtabstop = 4,
 	spelllang = "en_us",
 	splitbelow = true,
 	splitright = true,
 	swapfile = false,
-	tabstop = 2,
+	tabstop = 4,
 	termguicolors = true,
 	timeoutlen = 300,
 	title = true,