diff --git a/home/.config/nvim/lua/lsp_utils.lua b/home/.config/nvim/lua/lsp_utils.lua
index 4eb1e5c..5603b0a 100644
--- a/home/.config/nvim/lua/lsp_utils.lua
+++ b/home/.config/nvim/lua/lsp_utils.lua
@@ -63,10 +63,10 @@ function m.get_capabilities()
   )
 
   -- Neovim hasn't added foldingRange to default capabilities, users must add it manually for ufo
-  --capabilities.textDocument.foldingRange = {
-  --  dynamicRegistration = false,
-  --  lineFoldingOnly = true,
-  --}
+  capabilities.textDocument.foldingRange = {
+    dynamicRegistration = false,
+    lineFoldingOnly = true,
+  }
   return capabilities
 end
 
diff --git a/home/.config/nvim/lua/plugins/ufo.lua b/home/.config/nvim/lua/plugins/ufo.lua
index acd7c47..780c725 100644
--- a/home/.config/nvim/lua/plugins/ufo.lua
+++ b/home/.config/nvim/lua/plugins/ufo.lua
@@ -1,7 +1,5 @@
 -- Better folds
--- Disabled for now because it causes weird artifacts
 return {
-  enabled = false,
   "kevinhwang91/nvim-ufo",
   dependencies = { "kevinhwang91/promise-async" },
   opts = {
@@ -13,14 +11,13 @@ return {
     local ufo = require("ufo")
     ufo.setup(opts)
 
-    -- Using ufo, need to remap `zR` and `zM`. If Neovim is 0.6.1, remap yourself
-    local keymap = vim.keymap
-    keymap.set("n", "zR", ufo.openAllFolds)
-    keymap.set("n", "zM", ufo.closeAllFolds)
+    -- Using ufo, we need to remap `zR` and `zM`
+    vim.keymap.set("n", "zR", ufo.openAllFolds)
+    vim.keymap.set("n", "zM", ufo.closeAllFolds)
 
     -- Fold settings
     local o = vim.o
-    o.foldcolumn = "1"
+    o.foldcolumn = "0"
     o.foldlevel = 99
     o.foldlevelstart = 99
     o.foldenable = true