diff --git a/nvim/init.lua b/nvim/init.lua
index 95aceba..99584ee 100755
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -25,15 +25,6 @@ vim.cmd([[
   vnoremap <m-k> :m '<-2<CR>gv=gv
 ]])
 
-vim.cmd([[
-  if exists("g:neovide")
-    set guifont=JetBrainsMonoNL\ Nerd\ Font\ Mono:h10
-    let g:neovide_hide_mouse_when_typing = v:true
-    let g:neovide_cursor_vfx_mode = "pixiedust"
-    let g:neovide_remember_window_size = v:true
-    let g:neovide_transparency = 0.8
-  endif
-]])
 
 -- NEOVIDE SETTINGS
 if vim.g.neovide then
diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index 7331e65..e5e41ef 100755
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -11,7 +11,7 @@
   "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "7f9a39fcd2ac6e979001f857727d606888f5909c" },
   "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" },
-  "mini.nvim": { "branch": "main", "commit": "80a11490e44a7fe8c911a3b4a827c56df3894058" },
+  "mini.icons": { "branch": "main", "commit": "f9a177c11daa7829389b7b6eaaec8b8a5c47052d" },
   "neoformat": { "branch": "master", "commit": "2b11fb9fa383636de5de9ecc7c989436c4e0f9d1" },
   "nvim-lspconfig": { "branch": "master", "commit": "107c2458cdc780c4ed2c2b5e1b7800cd019010bd" },
   "nvim-tree.lua": { "branch": "master", "commit": "e179ad2f83b5955ab0af653069a493a1828c2697" },
@@ -21,6 +21,7 @@
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
   "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" },
   "ranger.vim": { "branch": "master", "commit": "91e82debdf566dfaf47df3aef0a5fd823cedf41c" },
+  "smm.nvim": { "branch": "master", "commit": "90b3bc3dbf479f8358a4ceeeef6a0095ff4fbee6" },
   "telescope.nvim": { "branch": "master", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" },
   "toggleterm.nvim": { "branch": "main", "commit": "9a88eae817ef395952e08650b3283726786fb5fb" },
   "vim-css-color": { "branch": "master", "commit": "14fd934cdd9ca1ac0e53511094e612eb9bace373" },
diff --git a/nvim/lua/config/kinds.lua b/nvim/lua/config/kinds.lua
index f2de718..58ae25f 100755
--- a/nvim/lua/config/kinds.lua
+++ b/nvim/lua/config/kinds.lua
@@ -1,4 +1,33 @@
 return {
+    File = ' ',
+    Module = ' ',
+    Namespace = ' ',
+    Package = ' ',
+    Class = ' ',
+    Method = ' ',
+    Property = ' ',
+    Field = ' ',
+    Constructor = ' ',
+    Enum = ' ',
+    Interface = ' ',
+    Function = ' ',
+    Variable = ' ',
+    Constant = ' ',
+    String = ' ',
+    Number = ' ',
+    Boolean = ' ',
+    Array = ' ',
+    Object = ' ',
+    Key = ' ',
+    Null = ' ',
+    EnumMember = ' ',
+    Struct = ' ',
+    Event = ' ',
+    Operator = ' ',
+    TypeParameter = ' '
+}
+
+--[[return {
   Text = "",
   Method = "",
   Function = "󰊕",
@@ -24,4 +53,4 @@ return {
   Event = "",
   Operator = "",
   TypeParameter = "",
-}
+}]]
diff --git a/nvim/lua/config/neovide.lua b/nvim/lua/config/neovide.lua
index a4622c4..9ed8f62 100755
--- a/nvim/lua/config/neovide.lua
+++ b/nvim/lua/config/neovide.lua
@@ -1 +1,9 @@
 vim.g.neovide_remember_window_size = true
+
+vim.cmd([[
+  set guifont=JetBrainsMonoNL\ Nerd\ Font\ Mono:h10
+  let g:neovide_hide_mouse_when_typing = v:true
+  let g:neovide_cursor_vfx_mode = "pixiedust"
+  let g:neovide_remember_window_size = v:true
+  let g:neovide_transparency = 0.8
+]])
diff --git a/nvim/lua/plugins/barbar.lua b/nvim/lua/plugins/barbar.lua
index 6210a61..711a508 100755
--- a/nvim/lua/plugins/barbar.lua
+++ b/nvim/lua/plugins/barbar.lua
@@ -1,9 +1,9 @@
 return {
 	"romgrk/barbar.nvim",
 	dependencies = { "nvim-tree/nvim-web-devicons" },
-	lazy = false,
+  event = "VeryLazy",
+  init = function () vim.g.barbar_auto_setup = false end,
 	opts = {
-		bufferline = true,
 		no_name_title = "New Tab",
 	},
 	keys = {
diff --git a/nvim/lua/plugins/catppuccin.lua b/nvim/lua/plugins/catppuccin.lua
index 5185738..2d1cfe8 100755
--- a/nvim/lua/plugins/catppuccin.lua
+++ b/nvim/lua/plugins/catppuccin.lua
@@ -4,19 +4,15 @@ return {
 	lazy = false,
 	priority = 1000,
 	config = function()
-		if vim.g.neovide then
-			require("catppuccin").setup({
-				transparent_background = false,
-				term_colors = true,
-				flavour = "mocha",
-			})
-		else
-			require("catppuccin").setup({
-				transparent_background = true,
-				term_colors = true,
-				flavour = "mocha",
-			})
-		end
+    require("catppuccin").setup({
+      transparent_background = true,
+      float = {
+        transparent = true
+      },
+      auto_integrations = true,
+      term_colors = true,
+      flavour = "macchiato",
+    })
 		vim.cmd([[colorscheme catppuccin]])
 	end,
 }
diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua
index c03d1dc..c46f437 100644
--- a/nvim/lua/plugins/lsp.lua
+++ b/nvim/lua/plugins/lsp.lua
@@ -1,8 +1,10 @@
 return {
   { 
     "mason-org/mason-lspconfig.nvim", 
+    event = "VeryLazy",
     dependencies = {
       "mason-org/mason.nvim",
+      "nvim-mini/mini.icons",
       "neovim/nvim-lspconfig"
     },
     config = function()
@@ -17,11 +19,22 @@ return {
   },
   { 
     "saghen/blink.cmp", 
+    event = "VeryLazy",
     version = "1.*",
     opts = { 
       keymap = { preset = 'super-tab' },
 
-      completion = {},
+      completion = {
+        menu = { border = 'rounded' },
+      },
+
+      signature = {
+        enabled = true,
+        window = { 
+          border = 'rounded'
+        },
+      },
+
 
       sources = {
         default = { 'lsp', 'path', 'buffer' }
diff --git a/nvim/lua/plugins/lualine.lua b/nvim/lua/plugins/lualine.lua
index 6d974d1..328a53f 100755
--- a/nvim/lua/plugins/lualine.lua
+++ b/nvim/lua/plugins/lualine.lua
@@ -6,6 +6,7 @@ return {
 			component_separators = { left = "", right = "" },
 			section_separators = { left = "", right = "" },
 			disabled_filetypes = { "NvimTree", "alpha", "dashboard", "Outline" },
+      theme = "catppuccin",
 		},
 		sections = {
 			lualine_b = {
@@ -20,8 +21,5 @@ return {
       lualine_c = {},
 			lualine_x = { "lsp_status" },
 		},
-    winbar = {
-      lualine_c = { "filename" }
-    }
 	},
 }
diff --git a/nvim/lua/plugins/nvimtree.lua b/nvim/lua/plugins/nvimtree.lua
index f027f46..c1bfd51 100755
--- a/nvim/lua/plugins/nvimtree.lua
+++ b/nvim/lua/plugins/nvimtree.lua
@@ -1,6 +1,6 @@
 return {
 	"nvim-tree/nvim-tree.lua",
-	lazy = false,
+  lazy = false,
 	opts = {
 		filters = {
 			dotfiles = true,
diff --git a/nvim/lua/plugins/qol.lua b/nvim/lua/plugins/qol.lua
index 79a341b..6220b46 100755
--- a/nvim/lua/plugins/qol.lua
+++ b/nvim/lua/plugins/qol.lua
@@ -1,6 +1,3 @@
 return {
-	"ap/vim-css-color",
-	"numToStr/Comment.nvim",
 	"wakatime/vim-wakatime",
-	{ "echasnovski/mini.pairs", version = false },
 }
diff --git a/nvim/lua/plugins/spotify.lua b/nvim/lua/plugins/spotify.lua
new file mode 100644
index 0000000..3ab41b4
--- /dev/null
+++ b/nvim/lua/plugins/spotify.lua
@@ -0,0 +1,29 @@
+return {
+  'iamt4nk/smm.nvim',
+  dependencies = {
+    "nvim-lua/plenary.nvim",
+	  "nvim-telescope/telescope.nvim",
+  },
+  config = {
+    premium = true,
+    icons = true,
+
+    spotify = {
+      api_retry_max = 3,
+      api_retry_backoff = 2000,
+
+      auth = {
+        client_id = "171a225176894d5986df534d8ec951b6",
+        callback_url = "http://localhost",
+        callback_port = 4202,
+      }
+    }
+  },
+  keys = {
+    { "<leader>ss", "<CMD>Spotify<CR>", desc = "Show Spotify" },
+    { "<leader>sp", "<CMD>Spotify prev<CR>", desc = "Previous Song (spotify)" },
+    { "<leader>sn", "<CMD>Spotify next<CR>", desc = "Next Song (spotify)" },
+    { "<leader>sR", "<CMD>Spotify repeat<CR>", desc = "Toggle Repeat (spotify)" },
+    { "<leader>sS", "<CMD>Spotify shuffle<CR>", desc = "Toggle Shuffle (spotify)" }
+  }
+}
diff --git a/nvim/lua/plugins/toggleterm.lua b/nvim/lua/plugins/toggleterm.lua
index fdf6440..f310a74 100755
--- a/nvim/lua/plugins/toggleterm.lua
+++ b/nvim/lua/plugins/toggleterm.lua
@@ -15,6 +15,8 @@ return {
     { "<C-w>h", "<C-\\><C-n><C-w>h",  desc = "Focus Left", mode = { "t" } },
     { "<C-w>l", "<C-\\><C-n><C-w>l",  desc = "Focus Right", mode = { "t" } },
     { "<C-w>k", "<C-\\><C-n><C-w>k",  desc = "Focus Up", mode = { "t" } },
-    { "<C-w>l", "<C-\\><C-n><C-w>l",  desc = "Focus Down", mode = { "t" } }
+    { "<C-w>l", "<C-\\><C-n><C-w>l",  desc = "Focus Down", mode = { "t" } },
+    -- Terminal Applications
+    { "<leader>lt", "<CMD>TermExec cmd=lazydocker direction=float<CR>",  desc = "Open Lazydocker" }
   }
 }
diff --git a/nvim/lua/plugins/treesitter.lua b/nvim/lua/plugins/treesitter.lua
index ea9980b..64c1068 100755
--- a/nvim/lua/plugins/treesitter.lua
+++ b/nvim/lua/plugins/treesitter.lua
@@ -1,5 +1,6 @@
 return {
 	"nvim-treesitter/nvim-treesitter",
+  event = "VeryLazy",
 	config = function()
 		require("nvim-treesitter.configs").setup({
       sync_install = false,
diff --git a/nvim/lua/plugins/which-key.lua b/nvim/lua/plugins/which-key.lua
index 84fd452..e50024d 100755
--- a/nvim/lua/plugins/which-key.lua
+++ b/nvim/lua/plugins/which-key.lua
@@ -1,13 +1,19 @@
 return {
 	"folke/which-key.nvim",
-	init = function()
-		vim.o.timeout = true
-		vim.o.timeoutlen = 300
-	end,
+  event = "VeryLazy",
 	opts = {
 		win = {
 			border = "rounded",
-			margin = { 1, 1, 1, 1 },
+			padding = { 1, 1, 1, 1 },
 		},
 	},
+  keys = {
+    {
+      "<leader>?",
+      function ()
+        require("which-key").show({ global = false })
+      end,
+      desc = "Buffer Local Keymaps (which-key)",
+    },
+  },
 }