diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index 406d14e..a592eea 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -109,6 +109,7 @@ autocmd FileType go,lua set noexpandtab
 
 vim.g.mapleader = " "
 
+require("theme")
 require("format")
 require("lsp")
 
@@ -143,14 +144,6 @@ require("nvim-tree").setup({
 vim.g.nvim_tree_add_trailing = 1
 vim.g.nvim_tree_indent_markers = 1
 vim.g.nvim_tree_icons = {default = "", symlink = ""}
-vim.cmd([[
-  hi NvimTreeGitNew guibg=green
-  hi NvimTreeGitStaged guibg=lightgreen
-  hi NvimTreeGitDeleted guibg=red
-  hi NvimTreeGitDirty guibg=lightblue
-  hi NvimTreeGitIgnored guibg=gray
-  hi NvimTreeOpenedFolderName gui=italic,bold
-]])
 
 require("telescope").setup({
     defaults = {
diff --git a/config/nvim/lua/theme.lua b/config/nvim/lua/theme.lua
new file mode 100644
index 0000000..f94d524
--- /dev/null
+++ b/config/nvim/lua/theme.lua
@@ -0,0 +1,16 @@
+-- General
+vim.cmd([[
+hi Comment gui=italic
+]])
+
+-- File tree
+vim.cmd([[
+hi NvimTreeGitNew guibg=green
+hi NvimTreeGitStaged guibg=lightgreen
+hi NvimTreeGitDeleted guibg=red
+hi NvimTreeGitDirty guibg=lightblue
+hi NvimTreeGitMerge guibg=yellow
+hi NvimTreeGitIgnored guibg=gray
+
+hi NvimTreeOpenedFolderName gui=italic,bold
+]])