diff --git a/common/.config/btop/btop.conf b/common/.config/btop/btop.conf
index 3d903dd..bf2ad23 100644
--- a/common/.config/btop/btop.conf
+++ b/common/.config/btop/btop.conf
@@ -69,7 +69,7 @@ proc_colors = True
 proc_gradient = True
 
 #* If process cpu usage should be of the core it's running on or usage of the total available cpu power.
-proc_per_core = True
+proc_per_core = False
 
 #* Show process memory as bytes instead of percent.
 proc_mem_bytes = True
diff --git a/common/.config/nvim/lua/plugins.lua b/common/.config/nvim/lua/plugins.lua
index cb2e02b..51454d3 100644
--- a/common/.config/nvim/lua/plugins.lua
+++ b/common/.config/nvim/lua/plugins.lua
@@ -3,7 +3,7 @@ return {
         'rebelot/kanagawa.nvim',
         lazy = false,
         priority = 1000,
-        config = function ()
+        config = function()
             vim.cmd('colorscheme kanagawa')
         end
     },
@@ -14,7 +14,7 @@ return {
     {
         'lewis6991/gitsigns.nvim',
         dependencies = { 'nvim-lua/plenary.nvim' },
-        config = function ()
+        config = function()
             require('plugin-config/gitsigns')
         end
     },
@@ -33,7 +33,7 @@ return {
         },
         keys = {
             { '<leader>hh', '<cmd>lua require("harpoon.ui").toggle_quick_menu()<cr>', desc = "Toggle harpoon menu" },
-            { '<leader>hg', '<cmd>lua require("harpoon.mark").toggle_file() <cr>', desc = "Add file to harpoon list" },
+            { '<leader>hg', '<cmd>lua require("harpoon.mark").toggle_file() <cr>',    desc = "Add file to harpoon list" },
         },
         config = function()
             for pos = 1, 9 do
@@ -53,7 +53,7 @@ return {
             'folke/todo-comments.nvim',
             'kevinhwang91/nvim-bqf',
         },
-        config = function ()
+        config = function()
             require('plugin-config/telescope')
             require('todo-comments').setup({})
         end
@@ -64,13 +64,13 @@ return {
         dependencies = {
             'nvim-treesitter/nvim-treesitter',
         },
-        config = function ()
+        config = function()
             require('plugin-config/nvim-treesitter')
         end
     },
     {
         'mrjones2014/smart-splits.nvim',
-         config = function ()
+        config = function()
             require('plugin-config/smart-splits')
         end
     },
@@ -86,12 +86,32 @@ return {
         'gorbit99/codewindow.nvim',
         lazy = false,
         opts = {},
-        config = function ()
+        config = function()
             require('codewindow').apply_default_keybinds()
         end
     },
     {
-        'scrooloose/nerdcommenter'
+        'numToStr/Comment.nvim',
+        opts = {
+            padding = true,
+            toggler = {
+                line = '<leader>cc',
+                block = '<leader>bb',
+            },
+            opleader = {
+                line = '<leader>c',
+                block = '<leader>b',
+            },
+            extra = {
+                above = '<leader>cO',
+                below = '<leader>co',
+                eol = '<leader>ca',
+            },
+            mappings = {
+                basic = true,
+                extra = true,
+            },
+        },
     },
     {
         'glepnir/lspsaga.nvim',
@@ -131,7 +151,7 @@ return {
                 .. '.'
                 .. vim.version().minor
                 .. '.'
-                ..  vim.version().patch,
+                .. vim.version().patch,
                 'Nvim is open Source and freely distributable',
                 '',
                 'type  :checkhealth<Enter>     to optimize Nvim',
@@ -143,7 +163,7 @@ return {
                 .. '.'
                 .. vim.version().minor
             },
-            border = 'none';
+            border = 'none',
         },
     },
     {
@@ -190,33 +210,33 @@ return {
         branch = 'v1.x',
         dependencies = {
             -- LSP Support
-            {'neovim/nvim-lspconfig'},
-            {'williamboman/mason.nvim'},
-            {'williamboman/mason-lspconfig.nvim'},
+            { 'neovim/nvim-lspconfig' },
+            { 'williamboman/mason.nvim' },
+            { 'williamboman/mason-lspconfig.nvim' },
 
-            {'simrat39/rust-tools.nvim'},
+            { 'simrat39/rust-tools.nvim' },
 
             -- Autocompletion
-            {'hrsh7th/nvim-cmp'},
-            {'hrsh7th/cmp-nvim-lsp'},
-            {'hrsh7th/cmp-nvim-lua'},
-            {'hrsh7th/cmp-buffer'},
-            {'hrsh7th/cmp-path'},
-            {'hrsh7th/cmp-cmdline'},
-            {'saadparwaiz1/cmp_luasnip'},
+            { 'hrsh7th/nvim-cmp' },
+            { 'hrsh7th/cmp-nvim-lsp' },
+            { 'hrsh7th/cmp-nvim-lua' },
+            { 'hrsh7th/cmp-buffer' },
+            { 'hrsh7th/cmp-path' },
+            { 'hrsh7th/cmp-cmdline' },
+            { 'saadparwaiz1/cmp_luasnip' },
 
             -- Snippets
-            {'L3MON4D3/LuaSnip'},
-            {'rafamadriz/friendly-snippets'},
+            { 'L3MON4D3/LuaSnip' },
+            { 'rafamadriz/friendly-snippets' },
         },
-        config = function ()
+        config = function()
             require('lsp-general')
         end
     },
     {
         'ray-x/lsp_signature.nvim',
         opts = {
-            hint_prefix='🚀'
+            hint_prefix = '🚀'
         },
     },
     {
diff --git a/common/.config/nvim/plugin/packer_compiled.lua.old b/common/.config/nvim/plugin/packer_compiled.lua.old
deleted file mode 100644
index 88e5536..0000000
--- a/common/.config/nvim/plugin/packer_compiled.lua.old
+++ /dev/null
@@ -1,114 +0,0 @@
--- Automatically generated packer.nvim plugin loader code
-
-if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then
-  vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"')
-  return
-end
-
-vim.api.nvim_command('packadd packer.nvim')
-
-local no_errors, error_msg = pcall(function()
-
-_G._packer = _G._packer or {}
-_G._packer.inside_compile = true
-
-local time
-local profile_info
-local should_profile = false
-if should_profile then
-  local hrtime = vim.loop.hrtime
-  profile_info = {}
-  time = function(chunk, start)
-    if start then
-      profile_info[chunk] = hrtime()
-    else
-      profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6
-    end
-  end
-else
-  time = function(chunk, start) end
-end
-
-local function save_profiles(threshold)
-  local sorted_times = {}
-  for chunk_name, time_taken in pairs(profile_info) do
-    sorted_times[#sorted_times + 1] = {chunk_name, time_taken}
-  end
-  table.sort(sorted_times, function(a, b) return a[2] > b[2] end)
-  local results = {}
-  for i, elem in ipairs(sorted_times) do
-    if not threshold or threshold and elem[2] > threshold then
-      results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms'
-    end
-  end
-  if threshold then
-    table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)')
-  end
-
-  _G._packer.profile_output = results
-end
-
-time([[Luarocks path setup]], true)
-local package_path_str = "/home/benk/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/benk/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/benk/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/benk/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
-local install_cpath_pattern = "/home/benk/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so"
-if not string.find(package.path, package_path_str, 1, true) then
-  package.path = package.path .. ';' .. package_path_str
-end
-
-if not string.find(package.cpath, install_cpath_pattern, 1, true) then
-  package.cpath = package.cpath .. ';' .. install_cpath_pattern
-end
-
-time([[Luarocks path setup]], false)
-time([[try_loadstring definition]], true)
-local function try_loadstring(s, component, name)
-  local success, result = pcall(loadstring(s), name, _G.packer_plugins[name])
-  if not success then
-    vim.schedule(function()
-      vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {})
-    end)
-  end
-  return result
-end
-
-time([[try_loadstring definition]], false)
-time([[Defining packer_plugins]], true)
-_G.packer_plugins = {
-  catppuccin = {
-    loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/catppuccin",
-    url = "https://github.com/catppuccin/nvim"
-  },
-  ["kanagawa.nvim"] = {
-    loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/kanagawa.nvim",
-    url = "https://github.com/rebelot/kanagawa.nvim"
-  },
-  ["nvim-web-devicons"] = {
-    loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
-    url = "https://github.com/nvim-tree/nvim-web-devicons"
-  },
-  ["packer.nvim"] = {
-    loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/packer.nvim",
-    url = "https://github.com/wbthomason/packer.nvim"
-  }
-}
-
-time([[Defining packer_plugins]], false)
-
-_G._packer.inside_compile = false
-if _G._packer.needs_bufread == true then
-  vim.cmd("doautocmd BufRead")
-end
-_G._packer.needs_bufread = false
-
-if should_profile then save_profiles() end
-
-end)
-
-if not no_errors then
-  error_msg = error_msg:gsub('"', '\\"')
-  vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None')
-end