diff --git a/lua/config/autocmd.lua b/lua/config/autocmd.lua
index a04f650..5d66bc8 100644
--- a/lua/config/autocmd.lua
+++ b/lua/config/autocmd.lua
@@ -16,10 +16,10 @@ vim.api.nvim_create_autocmd({ 'FileType' }, {
 
 -- use 2 spaces for cpp
 vim.api.nvim_create_autocmd({ 'FileType' }, {
-	pattern = { 'cpp', 'cc', 'hpp', 'hh', 'md', 'markdown' },
+	pattern = { 'cpp', 'cc', 'hpp', 'hh', 'md', 'markdown', 'java' },
 	callback = function()
-		vim.opt.ts = 2
-		vim.opt.sw = 2
+		vim.opt.ts = 4
+		vim.opt.sw = 4
 		vim.opt.expandtab = true
 	end,
 })
diff --git a/lua/config/settings.lua b/lua/config/settings.lua
index d3c6a97..d9d8d9b 100644
--- a/lua/config/settings.lua
+++ b/lua/config/settings.lua
@@ -27,8 +27,8 @@ opt.pumheight = 10
 opt.fileencoding = 'utf-8'
 opt.splitbelow = true
 opt.splitright = true
-opt.ts = 4
-opt.sw = 4
+-- opt.ts = 4
+-- opt.sw = 4
 opt.smartindent = true
 --opt.expandtab " Converts tabs to spaces
 opt.showmode = false