diff --git a/common/.config/nvim/lua/plugins/code-generic.lua b/common/.config/nvim/lua/plugins/code-generic.lua
index c637dbc..d9902d8 100644
--- a/common/.config/nvim/lua/plugins/code-generic.lua
+++ b/common/.config/nvim/lua/plugins/code-generic.lua
@@ -1,89 +1,6 @@
 return {
     { "tpope/vim-repeat" },
 
-    { "arnamak/stay-centered.nvim" },
-
-    -- Better code folding
-    {
-        "kevinhwang91/nvim-ufo",
-        version = "v1.5.0",
-        cond = require("config.util").is_not_vscode(),
-        event = "VeryLazy",
-        dependencies = {
-            "kevinhwang91/promise-async",
-            {
-                "luukvbaal/statuscol.nvim",
-                config = function()
-                    local builtin = require("statuscol.builtin")
-                    require("statuscol").setup({
-                        relculright = true,
-                        segments = {
-                            { text = { "%s" }, click = "v:lua.ScSa" },
-                            { text = { builtin.foldfunc }, click = "v:lua.ScFa" },
-                            { text = { builtin.lnumfunc, " " }, click = "v:lua.ScLa" },
-                        },
-                    })
-                end,
-            },
-        },
-        opts = {
-            provider_selector = function()
-                return { "treesitter", "indent" }
-            end,
-            open_fold_hl_timeout = 0,
-            close_fold_kinds_for_ft = { default = { "imports", "comment" } },
-            fold_virt_text_handler = function(virtText, lnum, endLnum, width, truncate)
-                local newVirtText = {}
-                local totalLines = vim.api.nvim_buf_line_count(0)
-                local foldedLines = endLnum - lnum
-                local suffix = (" 󰇘 󰁂 %d %d%%"):format(foldedLines, foldedLines / totalLines * 100)
-                local sufWidth = vim.fn.strdisplaywidth(suffix)
-                local targetWidth = width - sufWidth
-                local curWidth = 0
-                for _, chunk in ipairs(virtText) do
-                    local chunkText = chunk[1]
-                    local chunkWidth = vim.fn.strdisplaywidth(chunkText)
-                    if targetWidth > curWidth + chunkWidth then
-                        table.insert(newVirtText, chunk)
-                    else
-                        chunkText = truncate(chunkText, targetWidth - curWidth)
-                        local hlGroup = chunk[2]
-                        table.insert(newVirtText, { chunkText, hlGroup })
-                        chunkWidth = vim.fn.strdisplaywidth(chunkText)
-                        -- str width returned from truncate() may less than 2nd argument, need padding
-                        if curWidth + chunkWidth < targetWidth then
-                            suffix = suffix .. (" "):rep(targetWidth - curWidth - chunkWidth)
-                        end
-                        break
-                    end
-                    curWidth = curWidth + chunkWidth
-                end
-                local rAlignAppndx = math.max(math.min(vim.opt.textwidth["_value"], width - 1) - curWidth - sufWidth, 0)
-                suffix = (" "):rep(rAlignAppndx) .. suffix
-                table.insert(newVirtText, { suffix, "MoreMsg" })
-                return newVirtText
-            end,
-        },
-        init = function()
-            vim.opt.foldcolumn = "1"
-            vim.opt.foldlevel = 99
-            vim.opt.foldlevelstart = 99
-            vim.opt.foldenable = true
-
-            vim.opt.fillchars = {
-                foldopen = "",
-                foldclose = "",
-                fold = " ",
-                foldsep = " ",
-                diff = "╱",
-                eob = " ",
-            }
-
-            vim.keymap.set("n", "zR", require("ufo").openAllFolds)
-            vim.keymap.set("n", "zM", require("ufo").closeAllFolds)
-        end,
-    },
-
     -- indent guides for Neovim
     {
         "lukas-reineke/indent-blankline.nvim",
diff --git a/common/.config/nvim/lua/plugins/ui.lua b/common/.config/nvim/lua/plugins/ui.lua
index c9eab6b..d78cedd 100644
--- a/common/.config/nvim/lua/plugins/ui.lua
+++ b/common/.config/nvim/lua/plugins/ui.lua
@@ -306,4 +306,84 @@ return {
             }
         end,
     },
+
+    -- Better folds
+    {
+        "kevinhwang91/nvim-ufo",
+        cond = require("config.util").is_not_vscode(),
+        event = "VeryLazy",
+        dependencies = {
+            "kevinhwang91/promise-async",
+            {
+                "luukvbaal/statuscol.nvim",
+                config = function()
+                    local builtin = require("statuscol.builtin")
+                    require("statuscol").setup({
+                        relculright = true,
+                        segments = {
+                            { text = { "%s" }, click = "v:lua.ScSa" },
+                            { text = { builtin.foldfunc }, click = "v:lua.ScFa" },
+                            { text = { builtin.lnumfunc, " " }, click = "v:lua.ScLa" },
+                        },
+                    })
+                end,
+            },
+        },
+        opts = {
+            provider_selector = function()
+                return { "treesitter", "indent" }
+            end,
+            open_fold_hl_timeout = 0,
+            close_fold_kinds_for_ft = { default = { "imports", "comment" } },
+            fold_virt_text_handler = function(virtText, lnum, endLnum, width, truncate)
+                local newVirtText = {}
+                local totalLines = vim.api.nvim_buf_line_count(0)
+                local foldedLines = endLnum - lnum
+                local suffix = (" 󰇘 󰁂 %d %d%%"):format(foldedLines, foldedLines / totalLines * 100)
+                local sufWidth = vim.fn.strdisplaywidth(suffix)
+                local targetWidth = width - sufWidth
+                local curWidth = 0
+                for _, chunk in ipairs(virtText) do
+                    local chunkText = chunk[1]
+                    local chunkWidth = vim.fn.strdisplaywidth(chunkText)
+                    if targetWidth > curWidth + chunkWidth then
+                        table.insert(newVirtText, chunk)
+                    else
+                        chunkText = truncate(chunkText, targetWidth - curWidth)
+                        local hlGroup = chunk[2]
+                        table.insert(newVirtText, { chunkText, hlGroup })
+                        chunkWidth = vim.fn.strdisplaywidth(chunkText)
+                        -- str width returned from truncate() may less than 2nd argument, need padding
+                        if curWidth + chunkWidth < targetWidth then
+                            suffix = suffix .. (" "):rep(targetWidth - curWidth - chunkWidth)
+                        end
+                        break
+                    end
+                    curWidth = curWidth + chunkWidth
+                end
+                local rAlignAppndx = math.max(math.min(vim.opt.textwidth["_value"], width - 1) - curWidth - sufWidth, 0)
+                suffix = (" "):rep(rAlignAppndx) .. suffix
+                table.insert(newVirtText, { suffix, "MoreMsg" })
+                return newVirtText
+            end,
+        },
+        init = function()
+            vim.opt.foldcolumn = "1"
+            vim.opt.foldlevel = 99
+            vim.opt.foldlevelstart = 99
+            vim.opt.foldenable = true
+
+            vim.opt.fillchars = {
+                foldopen = "",
+                foldclose = "",
+                fold = " ",
+                foldsep = " ",
+                diff = "╱",
+                eob = " ",
+            }
+
+            vim.keymap.set("n", "zR", require("ufo").openAllFolds)
+            vim.keymap.set("n", "zM", require("ufo").closeAllFolds)
+        end,
+    },
 }