diff --git a/init.lua b/init.lua
index 53ae74e5..ae66b5b0 100644
--- a/init.lua
+++ b/init.lua
@@ -835,15 +835,39 @@ require('lazy').setup({
     end,
   },
 
-  -- You can easily change to a different colorscheme.
-  -- Change the name of the colorscheme plugin below, and then
-  -- change the command in the config to whatever the name of that colorscheme is.
-  --
-  -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`.
+  -- Colorscheme
   {
-    'vague2k/vague.nvim',
+    'catppuccin/nvim',
     config = function()
-      require('vague').setup {}
+      require('catppuccin').setup {
+        integrations = {
+          cmp = true,
+          gitsigns = true,
+          harpoon = true,
+          illuminate = true,
+          indent_blankline = {
+            enabled = false,
+            scope_color = 'sapphire',
+            colored_indent_levels = false,
+          },
+          mason = true,
+          native_lsp = { enabled = true },
+          notify = true,
+          nvimtree = true,
+          neotree = true,
+          symbols_outline = true,
+          telescope = true,
+          treesitter = true,
+          treesitter_context = true,
+        },
+      }
+
+      vim.cmd.colorscheme 'catppuccin-macchiato'
+
+      -- Hide all semantic highlights until upstream issues are resolved (https://github.com/catppuccin/nvim/issues/480)
+      for _, group in ipairs(vim.fn.getcompletion('@lsp', 'highlight')) do
+        vim.api.nvim_set_hl(0, group, {})
+      end
     end,
   },
 
diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua
index a7f19ae6..377a7873 100644
--- a/lua/custom/plugins/init.lua
+++ b/lua/custom/plugins/init.lua
@@ -3,85 +3,94 @@
 --
 -- See the kickstart.nvim README for more information
 return {
-	{
-		"ThePrimeagen/harpoon",
-		dependencies = {
-			"nvim-lua/plenary.nvim",
-		},
-		opts = {
-			global_settings = {
-				save_on_toggle = true,
-				enter_on_sendcmd = true,
-			},
-		},
-		config = function ()
-			local harpoon_ui = require("harpoon.ui")
-			local harpoon_mark = require("harpoon.mark")
+  {
+    'ThePrimeagen/harpoon',
+    dependencies = {
+      'nvim-lua/plenary.nvim',
+    },
+    opts = {
+      global_settings = {
+        save_on_toggle = true,
+        enter_on_sendcmd = true,
+      },
+    },
+    config = function()
+      local harpoon_ui = require 'harpoon.ui'
+      local harpoon_mark = require 'harpoon.mark'
 
-			-- Harpoon keybinds --
-			-- Open harpoon ui
-			vim.keymap.set("n", "<C-e>", function()
-				harpoon_ui.toggle_quick_menu()
-			end)
+      -- Harpoon keybinds --
+      -- Open harpoon ui
+      vim.keymap.set('n', '<C-e>', function()
+        harpoon_ui.toggle_quick_menu()
+      end)
 
-			-- Add current file to harpoon
-			vim.keymap.set("n", "<leader>a", function()
-				harpoon_mark.add_file()
-			end)
+      -- Add current file to harpoon
+      vim.keymap.set('n', '<leader>a', function()
+        harpoon_mark.add_file()
+      end)
 
-			-- Quickly jump to harpooned files
-			vim.keymap.set("n", "<leader>1", function()
-				harpoon_ui.nav_file(1)
-			end)
+      -- Quickly jump to harpooned files
+      vim.keymap.set('n', '<leader>1', function()
+        harpoon_ui.nav_file(1)
+      end)
 
-			vim.keymap.set("n", "<leader>2", function()
-				harpoon_ui.nav_file(2)
-			end)
+      vim.keymap.set('n', '<leader>2', function()
+        harpoon_ui.nav_file(2)
+      end)
 
-			vim.keymap.set("n", "<leader>3", function()
-				harpoon_ui.nav_file(3)
-			end)
+      vim.keymap.set('n', '<leader>3', function()
+        harpoon_ui.nav_file(3)
+      end)
 
-			vim.keymap.set("n", "<leader>4", function()
-				harpoon_ui.nav_file(4)
-			end)
+      vim.keymap.set('n', '<leader>4', function()
+        harpoon_ui.nav_file(4)
+      end)
 
-			vim.keymap.set("n", "<leader>5", function()
-				harpoon_ui.nav_file(5)
-			end)
-		end
-	},
+      vim.keymap.set('n', '<leader>5', function()
+        harpoon_ui.nav_file(5)
+      end)
+    end,
+  },
 
-	{
-		'stevearc/oil.nvim',
-		opts = {},
-		dependencies = { "nvim-tree/nvim-web-devicons" },
-		config = function()
-			require("oil").setup({
-				columns = { "icon" },
-				keymaps = {
-					["<C-h>"] = false,
-					["<M-h>"] = "actions.select_split",
-				},
-				view_options = {
-					show_hidden = true,
-				},
-			})
+  {
+    'stevearc/oil.nvim',
+    opts = {},
+    dependencies = { 'nvim-tree/nvim-web-devicons' },
+    config = function()
+      require('oil').setup {
+        default_file_explorer = true,
+        skip_confirm_for_simple_edits = true,
+        columns = { 'icon' },
+        keymaps = {
+          ['<C-h>'] = false,
+          ['<M-h>'] = 'actions.select_split',
+        },
+        view_options = {
+          show_hidden = true,
+          natural_order = true,
+          is_always_hidden = function(name, bufnr)
+            return name == '..' or name == '.git'
+          end,
+        },
+        win_options = {
+          wrap = true,
+        },
+      }
 
-			-- Open parent directory in current window
-			vim.keymap.set("n", "-", "<CMD>Oil<CR>",{ desc = "Open parent directory" })
+      -- Open parent directory in current window
+      vim.keymap.set('n', '-', '<CMD>Oil<CR>', { desc = 'Open parent directory' })
 
-			-- Open parent directory in floating window
-			vim.keymap.set("n", "<space>-", require("oil").toggle_float)
-		end,
-	},
+      -- Open parent directory in floating window
+      vim.keymap.set('n', '<space>-', require('oil').toggle_float)
+    end,
+  },
 
-	{
-		'm4xshen/hardtime.nvim',
-		dependecies = { 'MunifTanjim/nui.nvim', 'nvim-lua/plenary.nvim' },
-		opts = {
-			restriction_mode = 'hint',
-		},
-		enabled = false,
-	},
+  {
+    'm4xshen/hardtime.nvim',
+    dependecies = { 'MunifTanjim/nui.nvim', 'nvim-lua/plenary.nvim' },
+    opts = {
+      restriction_mode = 'hint',
+    },
+    enabled = true,
+  },
 }