diff --git a/lua/plugins/config/catppuccin.lua b/lua/plugins/config/catppuccin.lua
new file mode 100644
index 0000000..930c2f5
--- /dev/null
+++ b/lua/plugins/config/catppuccin.lua
@@ -0,0 +1,52 @@
+vim.g.catppuccin_flavour = "mocha"
+
+require("catppuccin").setup {
+    term_colors = true,
+    styles = {
+        conditionals = { "italic", "bold" },
+        loops = { "italic", "bold" },
+        functions = { "italic", "bold" },
+        keywords = { "italic", "bold" },
+        strings = { "bold" },
+        variables = { "bold" },
+        numbers = { "bold" },
+        booleans = { "bold" },
+        properties = { "italic" },
+        types = { "italic", "bold" }
+    },
+    integrations = {
+        barbar = true,
+        gitsigns = true,
+        cmp = true,
+        nvimtree = true,
+        treesitter_context = true,
+        treesitter = true,
+        symbols_outline = true,
+        telescope = true,
+        lsp_trouble = true,
+        which_key = true,
+
+        indent_blankline = {
+            enabled = true,
+            colored_indent_levels = false
+        },
+
+        native_lsp = {
+            enabled = true,
+            virtual_text = {
+                errors = { "italic" },
+                hints = { "italic" },
+                warnings = { "italic" },
+                information = { "italic" }
+            },
+            underlines = {
+                errors = { "underline" },
+                hints = { "underline" },
+                warnings = { "underline" },
+                information = { "underline" }
+            }
+        },
+    }
+}
+
+vim.cmd [[colorscheme catppuccin]]
diff --git a/lua/plugins/config/lualine.lua b/lua/plugins/config/lualine.lua
index 5596741..39e874c 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/nvimtree.lua b/lua/plugins/config/nvimtree.lua
index 0c8cb40..4d30238 100644
--- a/lua/plugins/config/nvimtree.lua
+++ b/lua/plugins/config/nvimtree.lua
@@ -1,7 +1,7 @@
 require("nvim-tree").setup {
-    -- view = {
-    --    hide_root_folder = true
-    -- },
+    view = {
+        hide_root_folder = true
+    },
 
     renderer = {
         group_empty = true,
diff --git a/lua/plugins/config/tokyonight.lua b/lua/plugins/config/tokyonight.lua
index 0fcf810..a1bb539 100644
--- a/lua/plugins/config/tokyonight.lua
+++ b/lua/plugins/config/tokyonight.lua
@@ -3,4 +3,4 @@ require("tokyonight").setup {
     lualine_bold = true
 }
 
-vim.cmd [[colorscheme tokyonight]]
+-- vim.cmd [[colorscheme tokyonight]]
diff --git a/lua/plugins/config/whichkey.lua b/lua/plugins/config/whichkey.lua
index 8a71144..97437e7 100644
--- a/lua/plugins/config/whichkey.lua
+++ b/lua/plugins/config/whichkey.lua
@@ -21,7 +21,9 @@ wk.register({
         l = {
             name = "LSP",
             r = { "<cmd>lua vim.lsp.buf.rename()<CR>", "rename" },
-            d = { "<cmd>Telescope diagnostics<CR>", "diagnostics" }
+            d = { "<cmd>Telescope diagnostics<CR>", "diagnostics" },
+            f = { "<cmd>lua vim.lsp.buf.formatting()<CR>", "format" },
+            a = { "<cmd>lua vim.lsp.buf.code_action()<CR>", "code action" }
         },
 
         b = {
diff --git a/lua/plugins/setup.lua b/lua/plugins/setup.lua
index 01be816..90d4e41 100644
--- a/lua/plugins/setup.lua
+++ b/lua/plugins/setup.lua
@@ -31,6 +31,14 @@ return packer.startup(function(use)
         end
     }
 
+    use {
+        "catppuccin/nvim",
+        as = "catppuccin",
+        config = function()
+            require("plugins.config.catppuccin")
+        end
+    }
+
     use "kyazdani42/nvim-web-devicons"
 
     use {