diff --git a/lua/plugins/config/catppuccin.lua b/lua/plugins/config/catppuccin.lua
new file mode 100644
index 0000000..bbc1f7d
--- /dev/null
+++ b/lua/plugins/config/catppuccin.lua
@@ -0,0 +1,14 @@
+vim.g.catppuccin_flavour = "mocha"
+
+require("catppuccin").setup {
+    styles = {
+        loops = { "italic" },
+        functions = { "italic", "bold" }
+    },
+
+    integrations = {
+        lsp_trouble = true,
+        which_key = true,
+        barbar = true
+    }
+}
diff --git a/lua/plugins/config/cmp.lua b/lua/plugins/config/cmp.lua
index 55174c4..0baef0b 100644
--- a/lua/plugins/config/cmp.lua
+++ b/lua/plugins/config/cmp.lua
@@ -12,7 +12,9 @@ cmp.setup {
         ["<C-f>"] = cmp.mapping.scroll_docs(4),
         ["<C-Space>"] = cmp.mapping.complete(),
         ["<C-e>"] = cmp.mapping.abort(),
-        ["<CR>"] = cmp.mapping.confirm({ select = true })
+        ["<CR>"] = cmp.mapping.confirm({ select = true }),
+        ["<Tab>"] = cmp.mapping.select_next_item(),
+        ["<S-Tab>"] = cmp.mapping.select_prev_item()
     }),
 
     sources = cmp.config.sources({
diff --git a/lua/plugins/config/lspsetup.lua b/lua/plugins/config/lspsetup.lua
index 0c3456a..049ef03 100644
--- a/lua/plugins/config/lspsetup.lua
+++ b/lua/plugins/config/lspsetup.lua
@@ -5,6 +5,7 @@ require("lsp-setup").setup {
         gopls = {},
         cssls = {},
         jsonls = {},
-        html = {}
+        html = {},
+        pylsp = {}
     }
 }
diff --git a/lua/plugins/config/lualine.lua b/lua/plugins/config/lualine.lua
index ac4eb99..c1c495c 100644
--- a/lua/plugins/config/lualine.lua
+++ b/lua/plugins/config/lualine.lua
@@ -1,6 +1,6 @@
 require("lualine").setup {
     options = {
-        theme = "tokyonight"
+        theme = "catppuccin"
     },
 
     extensions = {
diff --git a/lua/plugins/config/tokyonight.lua b/lua/plugins/config/tokyonight.lua
index e19b052..6d7b9bb 100644
--- a/lua/plugins/config/tokyonight.lua
+++ b/lua/plugins/config/tokyonight.lua
@@ -1,5 +1,3 @@
 local g = vim.g
 
 vim.g.tokyonight_italic_functions = true
-
-vim.cmd[[colorscheme tokyonight]]
diff --git a/lua/plugins/config/whichkey.lua b/lua/plugins/config/whichkey.lua
index 3a9b713..8dc682a 100644
--- a/lua/plugins/config/whichkey.lua
+++ b/lua/plugins/config/whichkey.lua
@@ -1,50 +1,68 @@
 local wk = require("which-key")
 
 wk.setup {
-    ignore_missing = false
+    -- TODO: Change to true
+    ignore_missing = false,
+    key_labels = {
+        ["<space>"] = "SPC"
+    }
 }
 
 wk.register({
     ["<leader>"] = {
-        -- Barbar
+        -- Files
+        ["<space>"] = { "<cmd>Telescope fd<CR>", "find files" },
+
+        -- Buffers
         b = {
-            name = "Barbar",
-            x = { "<cmd>BufferClose<CR>", "Close Buffer" },
-            n = { "<cmd>BufferMoveNext<CR>", "Move Next" },
-            m = { "<cmd>BufferMovePrevious<CR>", "Move Previous" },
+            name = "buffers",
+            x = { "<cmd>BufferClose<CR>", "close buffer" },
+            n = { "<cmd>BufferMoveNext<CR>", "move next" },
+            m = { "<cmd>BufferMovePrevious<CR>", "move previous" },
+            f = { "<cmd>Telescope current_buffer_fuzzy_find<CR>", "find in current buffer" },
 
             p = {
-                name = "Pinned Buffers",
-                p = { "<cmd>BufferPin<CR>", "Pin Buffer" },
-                x = { "<cmd>BufferCloseAllButPinned<CR>", "Close All But Pinned" }
+                name = "pinned buffers",
+                p = { "<cmd>BufferPin<CR>", "pin buffer" },
+                x = { "<cmd>BufferCloseAllButPinned<CR>", "close all but pinned" }
             }
         },
 
         -- Telescope
         t = {
             name = "Telescope",
-            w = { "<cmd>Telescope live_grep<CR>", "Live Grep" },
-            f = { "<cmd>Telescope fd<CR>", "Find Files" },
-            c = { "<cmd>Telescope current_buffer_fuzzy_find<CR>", "Find In Current Buffer" },
+            w = { "<cmd>Telescope live_grep<CR>", "live grep" },
             b = { "<cmd>Telescope buffers<CR>", "Buffers" },
             k = { "<cmd>Telescope keymaps<CR>", "Keymaps" },
-            t = { "<cmd>TodoTelescope<CR>", "Todos" }
+            t = { "<cmd>TodoTelescope<CR>", "Todos" },
+            c = { "<cmd>TodoTelescope<CR>", "" },
+            ["."] = { "<cmd>Telescope keymaps<CR>", "Global Keymaps" }
         },
 
+        -- Git
         g = {
             name = "Git",
             b = { "<cmd>Gitsigns blame_line<CR>", "Blame Line" },
             d = { "<cmd>Gitsigns diffthis<CR>", "Diff" }
+        },
+
+        -- LSP
+        l = {
+            name = "LSP",
+            a = { "<cmd>vim.lsp.buf.code_action()<CR>", "Code Action" },
+            f = { "<cmd>vim.lsp.buf.formatting()<CR>", "Format" },
+            n = { "<cmd>vim.lsp.buf.rename()<CR>", "Rename" }
         }
     },
 
     -- NvimTree
     ["<C-n>"] = { "<cmd>NvimTreeToggle<CR>", "NvimTree Toggle" },
 
-    -- Barbar (switching buffers)
+    -- Switching Buffers
     ["<TAB>"] = { "<cmd>BufferNext<CR>", "Next Buffer" },
     ["<S-TAB>"] = { "<cmd>BufferPrevious<CR>", "Previous Buffer" },
 
+    -- Trouble
     ["t"] = {
         name = "Trouble",
         t = { "<cmd>TroubleToggle<CR>", "Trouble Toggle" },
diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua
index 6fb4085..9b261cd 100644
--- a/lua/plugins/init.lua
+++ b/lua/plugins/init.lua
@@ -1,9 +1,12 @@
 local fn = vim.fn
 local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim"
 if fn.empty(fn.glob(install_path)) > 0 then
-    packer_bootstrap = fn.system({ "git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim", install_path })
+    packer_bootstrap = fn.system({ "git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim",
+        install_path })
     print("Installing packer: close and reopen Neovim...")
 end
 
 require("plugins.setup")
 require("plugins.barbar_nvimtree")
+
+vim.cmd [[colorscheme catppuccin]]
diff --git a/lua/plugins/setup.lua b/lua/plugins/setup.lua
index a86acc0..592f688 100644
--- a/lua/plugins/setup.lua
+++ b/lua/plugins/setup.lua
@@ -10,6 +10,14 @@ require("packer").startup(function(use)
         end
     }
 
+    use {
+        "catppuccin/nvim",
+        as = "catppuccin",
+        config = function()
+            require("plugins.config.catppuccin")
+        end
+    }
+
     use {
         "kyazdani42/nvim-web-devicons",
         config = function()