diff --git a/roles/nvim/files/init.lua b/roles/nvim/files/init.lua
old mode 100755
new mode 100644
index 6e57360..5e53b15
--- a/roles/nvim/files/init.lua
+++ b/roles/nvim/files/init.lua
@@ -19,7 +19,7 @@ vim.opt.rtp:prepend(lazypath)
 -- Add Plugins
 require("lazy").setup({
   -- Stats
-  { 'wakatime/vim-wakatime', lazy = false },
+  { 'wakatime/vim-wakatime',  lazy = false },
 
   -- Theme
   {
@@ -27,20 +27,24 @@ require("lazy").setup({
     name = "catppuccin.vim",
     priority = 1000,
     config = function()
-      vim.cmd.colorscheme("catppuccin")
+      vim.cmd.colorscheme("catppuccin-macchiato")
     end,
   },
 
   -- Syntax highlighting support
-  "elkowar/yuck.vim",
-  "fladson/vim-kitty",
-  -- Use "gc" to comment visual regions/lines
-  { "numToStr/Comment.nvim", opts = {} },
+  -- "fladson/vim-kitty",
 
-  -- Detect tabstop and shiftwidth automatically
-  -- "tpope/vim-sleuth",
+  -- Comment visual regions/lines
+  "numToStr/Comment.nvim",
 
-  -- Add indentation guides even on blank lines ???
+  -- Autoclose brackets
+  { "m4xshen/autoclose.nvim", opts = {} },
+  { "windwp/nvim-ts-autotag", opts = {},   lazy = false }, -- Doesn't work?
+
+  -- Surround selection
+  "tpope/vim-surround",
+
+  -- Add indentation guides
   {
     "lukas-reineke/indent-blankline.nvim",
     main = "ibl",
@@ -60,7 +64,7 @@ require("lazy").setup({
     },
   },
 
-  -- LSP (Configuration under "lspconfig")
+  -- LSP
   {
     "neovim/nvim-lspconfig",
     dependencies = {
diff --git a/roles/system/tasks/Archlinux.yml b/roles/system/tasks/Archlinux.yml
index bb6ad7f..32db01f 100644
--- a/roles/system/tasks/Archlinux.yml
+++ b/roles/system/tasks/Archlinux.yml
@@ -50,6 +50,7 @@
       - maven
       - rustup
       - npm
+      - go
     state: present
   tags:
     - programming_pkgs
@@ -133,6 +134,7 @@
       - yt-dlp
       - nvtop
       - nemo
+      - nemo-fileroller
       - mpv
       # Device configuration
       #- openrazer-daemon