diff --git a/lazy-lock.json b/lazy-lock.json
index 09c3128..3ba9271 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,9 +1,10 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "e51f2b142d88bb666dcaa77d93a07f4b419aca70" },
+  "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" },
   "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
   "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" },
   "auto-conform.nvim": { "branch": "main", "commit": "8d2fbcbd8b8dfd44e1bc2edffc3fe7372b5b520e" },
-  "auto-lint.nvim": { "branch": "main", "commit": "fa2c16211524e965242196e55b1f748d63332dcd" },
+  "auto-lint.nvim": { "branch": "main", "commit": "52bf448e3b13fca21d91b39c6e23e5e309ae094a" },
   "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" },
   "bufferline.nvim": { "branch": "main", "commit": "81820cac7c85e51e4cf179f8a66d13dbf7b032d9" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
@@ -20,7 +21,7 @@
   "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" },
   "gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" },
   "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" },
-  "lazy.nvim": { "branch": "main", "commit": "cea5920abb202753004440f94ec39bcf2927e02e" },
+  "lazy.nvim": { "branch": "main", "commit": "407e65c7924989c1efed6bbc89e6287e2d140f02" },
   "live-server.nvim": { "branch": "main", "commit": "f34ae262bf046981d9e5f7cd4f41a353a9647a22" },
   "lsp-progress.nvim": { "branch": "main", "commit": "c5858bba2043cac5ad4113fe1263366125b1b314" },
   "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
@@ -29,6 +30,8 @@
   "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
   "mini.indentscope": { "branch": "main", "commit": "1222393d9c5e8d92b913ccab6701a7164b21781c" },
   "neoscroll.nvim": { "branch": "master", "commit": "a731f66f1d39ec6175fd201c5bf849e54abda99c" },
+  "neotest": { "branch": "master", "commit": "f30bab1faef13d47f3905e065215c96a42d075ad" },
+  "neotest-java": { "branch": "main", "commit": "320f31c71b183f2c584198f33f93542fd0e5a768" },
   "noice.nvim": { "branch": "main", "commit": "03c6a75661e68012e30b0ed81f050358b1e2233c" },
   "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" },
   "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
@@ -37,6 +40,7 @@
   "nvim-dap": { "branch": "master", "commit": "5ba8ceace596360321cf33fa4b56d9d46e057ce9" },
   "nvim-dap-ui": { "branch": "master", "commit": "f7d75cca202b52a60c520ec7b1ec3414d6e77b0f" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "484995d573c0f0563f6a66ebdd6c67b649489615" },
+  "nvim-jdtls": { "branch": "master", "commit": "a5c6f38f8151d7b4f5b32c005a95022fa66f4c9d" },
   "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" },
   "nvim-lspconfig": { "branch": "master", "commit": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98" },
   "nvim-material-icon": { "branch": "main", "commit": "01d95380c6c643d663f8d3cf8a7b274ece6da389" },
@@ -45,7 +49,7 @@
   "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
   "nvim-scrollview": { "branch": "main", "commit": "30ca6e18265928eb4ea7402346b4dfddbd8ce41e" },
   "nvim-tree.lua": { "branch": "master", "commit": "2086e564c4d23fea714e8a6d63b881e551af2f41" },
-  "nvim-treesitter": { "branch": "master", "commit": "acc1708b962e12cc1d671cd530782727801804c3" },
+  "nvim-treesitter": { "branch": "master", "commit": "f2f828c5e995af156106a4aa5647463e49fff66a" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" },
   "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "2b7dcf6aab0947b9c4195f1d8aa592cdcd944ffe" },
@@ -55,6 +59,7 @@
   "rainbow-delimiters.nvim": { "branch": "master", "commit": "12b1a1e095d968887a17ef791c2edb78d7595d46" },
   "rest.nvim": { "branch": "main", "commit": "91badd46c60df6bd9800c809056af2d80d33da4c" },
   "smart-splits.nvim": { "branch": "master", "commit": "66fda3a601a5b4c679656f15eb6ddd613c8d3216" },
+  "symbols-outline.nvim": { "branch": "master", "commit": "964c5902243446124417a3a9e9454f5ef032cc36" },
   "telescope.nvim": { "branch": "master", "commit": "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a" },
   "tiny-devicons-auto-colors.nvim": { "branch": "main", "commit": "9be4af5b1bc1f26a11206ed7ce8bf44312e7941a" },
   "toggleterm.nvim": { "branch": "main", "commit": "cd55bf6aab3f88c259fa29ea86bbdcb1a325687d" },
diff --git a/lua/custom/default.lua b/lua/custom/default.lua
index 0a126e1..4c984b3 100644
--- a/lua/custom/default.lua
+++ b/lua/custom/default.lua
@@ -173,7 +173,7 @@ pcode.active_golang_config = false
 pcode.active_python_config = false
 pcode.active_cpp_config = false
 pcode.active_java_config = {
-  active = false,
+  active = true,
   project = "gradle", -- gradle or maven
   use_nvim_jdtls = true, -- mfussenegger/nvim-jdtls
 }
diff --git a/lua/plugins/autoconform.lua b/lua/plugins/autoconform.lua
index 28a0aca..13485cc 100644
--- a/lua/plugins/autoconform.lua
+++ b/lua/plugins/autoconform.lua
@@ -11,52 +11,17 @@ if disable then
       "stevearc/conform.nvim",
     },
     event = "VeryLazy",
-    config = function()
-      require("auto-conform").setup({
-        -- formatters config conform
-        formatters = {
-          -- yamlfix = {
-          --   -- Change where to find the command
-          --   command = "local/path/yamlfix",
-          --   -- Adds environment args to the yamlfix formatter
-          --   env = {
-          --     YAMLFIX_SEQUENCE_STYLE = "block_style",
-          --   },
-          -- },
-        },
-        -- formatters_by_ft conform
-        formatters_by_ft = {
-          lua = { "stylua" },
-        },
-        -- install mason formatter
-        ensure_installed = {
-          "prettier",
-        },
-        -- mapping masson language vs filetype
-        lang_maps = {
-          -- ["c++"] = "cpp",
-          -- ["c#"] = "cs",
-          -- ["jsx"] = "javascriptreact",
-        },
-        -- mappings conform name vs masonn name if not same
-        name_maps = {
-          -- ["cmakelang"] = "cmake_format",
-          -- ["deno"] = "deno_fmt",
-          -- ["elm-format"] = "elm_format",
-        },
-        -- add new mapping to conform
-        add_new = {
-          -- ["jsonc"] = {"prettier"},
-          -- ["json"] = {"prettier"},
-          -- ["typescriptreact"] = {"prettier"},
-        },
-        -- disable register mason to conform
-        ignore = {
-          -- ["php"] = {"tlint"},
-          -- ["lua"] = {"ast-grep"},
-          -- ["kotlin"] = {"ktlint"},
-        },
-      })
+    opts = function(_, opts)
+      opts.formatters = opts.formatters or {}
+      opts.formatters_by_ft = opts.formatters_by_ft or {}
+      opts.ensure_installed = opts.ensure_installed or {}
+      opts.lang_maps = opts.lang_maps or {}
+      opts.name_maps = opts.name_maps or {}
+      opts.add_new = opts.add_new or {}
+      opts.ignore = opts.ignore or {}
+    end,
+    config = function(_, opts)
+      require("auto-conform").setup(opts)
       -- other conform config
       local conform = require("conform")
       conform.setup({
diff --git a/lua/plugins/java.lua b/lua/plugins/java.lua
index 79d2bd8..d6e1ff5 100644
--- a/lua/plugins/java.lua
+++ b/lua/plugins/java.lua
@@ -138,6 +138,7 @@ if pcode.active_java_config.active then
             if client and client.name == "jdtls" then
               local wk = require("which-key")
               wk.register({
+                ["<leader>c"] = { name = "+code" },
                 ["<leader>cx"] = { name = "+extract" },
                 ["<leader>cxv"] = { require("jdtls").extract_variable_all, "Extract Variable" },
                 ["<leader>cxc"] = { require("jdtls").extract_constant, "Extract Constant" },
@@ -167,15 +168,15 @@ if pcode.active_java_config.active then
                 require("jdtls.dap").setup_dap_main_class_configs(opts.dap_main)
 
                 -- Java Test require Java debugger to work
-                if opts.test and mason_registry.is_installed("java-test") then
-                  -- custom keymaps for Java test runner (not yet compatible with neotest)
-                  wk.register({
-                    ["<leader>t"] = { name = "+test" },
-                    ["<leader>tt"] = { require("jdtls.dap").test_class, "Run All Test" },
-                    ["<leader>tr"] = { require("jdtls.dap").test_nearest_method, "Run Nearest Test" },
-                    ["<leader>tT"] = { require("jdtls.dap").pick_test, "Run Test" },
-                  }, { mode = "n", buffer = args.buf })
-                end
+                -- if opts.test and mason_registry.is_installed("java-test") then
+                --   -- custom keymaps for Java test runner (not yet compatible with neotest)
+                --   wk.register({
+                --     ["<leader>t"] = { name = "+test" },
+                --     ["<leader>tt"] = { require("jdtls.dap").test_class, "Run All Test" },
+                --     ["<leader>tr"] = { require("jdtls.dap").test_nearest_method, "Run Nearest Test" },
+                --     ["<leader>tT"] = { require("jdtls.dap").pick_test, "Run Test" },
+                --   }, { mode = "n", buffer = args.buf })
+                -- end
               end
 
               -- User can set additional keymaps in opts.on_attach
@@ -205,13 +206,11 @@ if pcode.active_java_config.active then
       end,
     },
     {
-      "stevearc/conform.nvim",
+      "pojokcodeid/auto-conform.nvim",
       event = "VeryLazy",
       opts = function(_, opts)
-        local package = "lsp_fmt"
-        require("user.utils.masoncfg").try_install("java-debug-adapter")
-        require("user.utils.masoncfg").try_install("java-test")
-        opts.formatters_by_ft.java = { package }
+        vim.list_extend(opts.ensure_installed, { "java-debug-adapter", "java-test" })
+        opts.formatters_by_ft.java = { "lsp_fmt" }
       end,
     },
     {