diff --git a/lua/plugins/config/catppuccin.lua b/lua/plugins/config/catppuccin.lua
deleted file mode 100644
index b5dfdeb..0000000
--- a/lua/plugins/config/catppuccin.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-require("catppuccin").setup {
-    integrations = {
-        lsp_trouble = true,
-        which_key = true,
-        barbar = true
-    }
-}
-
-vim.cmd[[colorscheme catppuccin]]
diff --git a/lua/plugins/config/lualine.lua b/lua/plugins/config/lualine.lua
index c1c495c..ac4eb99 100644
--- a/lua/plugins/config/lualine.lua
+++ b/lua/plugins/config/lualine.lua
@@ -1,6 +1,6 @@
 require("lualine").setup {
     options = {
-        theme = "catppuccin"
+        theme = "tokyonight"
     },
 
     extensions = {
diff --git a/lua/plugins/config/nvimtree.lua b/lua/plugins/config/nvimtree.lua
index b1b8f7a..7a3f56d 100644
--- a/lua/plugins/config/nvimtree.lua
+++ b/lua/plugins/config/nvimtree.lua
@@ -1,12 +1,6 @@
-local g = vim.g
-
-g.nvim_tree_git_hl = 1
-g.nvim_tree_highlight_opened_files = 1
-g.nvim_tree_group_empty = 1
-g.nvim_tree_create_in_closed_folder = 1
-
 require("nvim-tree").setup {
     disable_netrw = true,
+    create_in_closed_folder = true,
     hijack_cursor = true,
     update_cwd = true,
 
@@ -15,6 +9,9 @@ require("nvim-tree").setup {
     },
 
     renderer = {
+        highlight_git = true,
+        highlight_opened_files = "all",
+        group_empty = true,
         indent_markers = {
             enable = true
         }
diff --git a/lua/plugins/config/tokyonight.lua b/lua/plugins/config/tokyonight.lua
new file mode 100644
index 0000000..e19b052
--- /dev/null
+++ b/lua/plugins/config/tokyonight.lua
@@ -0,0 +1,5 @@
+local g = vim.g
+
+vim.g.tokyonight_italic_functions = true
+
+vim.cmd[[colorscheme tokyonight]]
diff --git a/lua/plugins/setup.lua b/lua/plugins/setup.lua
index 8cc3329..2127c22 100644
--- a/lua/plugins/setup.lua
+++ b/lua/plugins/setup.lua
@@ -4,10 +4,9 @@ require("packer").startup(function(use)
     use "nathom/filetype.nvim"
 
     use {
-        "catppuccin/nvim",
-        as = "catppuccin",
+        "folke/tokyonight.nvim",
         config = function()
-            require("plugins.config.catppuccin")
+            require("plugins.config.tokyonight")
         end
     }
 
@@ -124,7 +123,7 @@ require("packer").startup(function(use)
         {
             "neovim/nvim-lspconfig",
             config = function()
-                require("nvim-lsp-installer").setup {}
+                require("nvim-lsp-installer").setup()
             end
         }
     }