diff --git a/lua/vscode/colors.lua b/lua/vscode/colors.lua
index c171261..ad23601 100644
--- a/lua/vscode/colors.lua
+++ b/lua/vscode/colors.lua
@@ -12,6 +12,7 @@ colors.get_colors = function()
             vscTabOther = '#2D2D2D',
             vscTabOutside = '#252526',
 
+            vscSidebar = "#181818",
             vscLeftDark = '#252526',
             vscLeftMid = '#373737',
             vscLeftLight = '#636369',
diff --git a/lua/vscode/theme.lua b/lua/vscode/theme.lua
index b44c032..2edc622 100644
--- a/lua/vscode/theme.lua
+++ b/lua/vscode/theme.lua
@@ -649,20 +649,27 @@ theme.set_highlights = function(opts)
     hl(0, 'MiniStatuslineFileinfo', { bg = c.vscLeftLight, fg = c.vscFront })
     hl(0, 'MiniStatuslineInactive', { bg = c.vscLeftDark, fg = c.vscFront })
 
-	-- Neotree
-	hl(0, 'NeoTreeBufferNumber', { fg = c.vscLineNumber, bg = 'NONE' })
-	hl(0, 'NeoTreeCursorLine', { fg = 'NONE', bg = c.vscCursorDarkDark })
-	hl(0, 'NeoTreeDimText', { fg = 'NONE', bg = c.vscCursorDarkDark })
-	hl(0, 'NeoTreeDirectoryIcon', { fg = c.vscBlue, bg = 'NONE' })
-	hl(0, 'NeoTreeDirectoryName', { fg = c.vscFront, bg = 'NONE' })
-	hl(0, 'NeoTreeDotfile', { fg = c.vscDisabledBlue, bg = 'NONE' })
-	hl(0, 'NeoTreeFileIcon', { fg = c.vscViolet, bg = 'NONE' })
-	hl(0, 'NeoTreeFileName', { fg = c.vscFront, bg = 'NONE' })
-	hl(0, 'NeoTreeFileNameOpened', { fg = c.vscFront, bg = c.vscCursorDarkDark })
-	hl(0, 'NeoTreeFilterTerm', { fg = c.vscFront, bg = 'NONE' })
-	hl(0, 'NeoTreeFloatBorder', { fg = c.vscLineNumber, bg = 'NONE' })
-	hl(0, 'NeoTreeFloatTitle', { fg = c.vscLineNumber, bg = 'NONE' })
-	hl(0, 'NeoTreeTitleBar', { fg = c.vscLineNumber, bg = 'NONE' })
+    -- Neotree
+    hl(0, 'NeoTreeRootName', { fg = c.vscFront, bg = 'NONE', bold = true })
+    hl(0, 'NeoTreeGitModified', { fg = c.vscYellow, bg = 'NONE' })
+    hl(0, 'NeoTreeGitAdded', { fg = c.vscGreen, bg = 'NONE' })
+    hl(0, 'NeoTreeSymbolicLinkTarget', { fg = c.vscViolet, bg = 'NONE' })
+    hl(0, 'NeoTreeHiddenByName', { fg = c.vscGray, bg = 'NONE' })
+    hl(0, 'NeoTreeDirectoryName', { fg = c.vscFront, bg = 'NONE' })
+    hl(0, 'NeoTreeFileName', { fg = c.vscPink, bg = 'NONE', underline = true })
+    hl(0, 'NeoTreeNormal', { fg = c.vscFront, bg = c.vscSidebar or c.vscLeftDark })
+    hl(0, 'NeoTreeNormalNC', { fg = c.vscFront, bg = c.vscSidebar or c.vscLeftDark })
+    hl(0, 'NeoTreeCursorLine', { fg = 'NONE', bg = c.vscCursorDarkDark or c.vscLeftMid })
+    hl(0, 'NeoTreeVertSplit', { fg = c.vscSplitDark or c.vscBack, bg = c.vscBack })
+    hl(0, 'NeoTreeEndOfBuffer', { fg = c.vscCursorDarkDark or c.vscLeftDark })
+    hl(0, 'NeoTreeDirectoryName', { fg = c.vscFront, bg = c.vscCursorDarkDark or c.vscLeftDark })
+    hl(0, 'NeoTreeGitRenamed', { fg = c.vscGitRenamed, bg = 'NONE' })
+    hl(0, 'NeoTreeGitIgnored', { fg = c.vscGitIgnored, bg = 'NONE' })
+    hl(0, 'NeoTreeGitDeleted', { fg = c.vscGitDeleted, bg = 'NONE' })
+    hl(0, 'NeoTreeGitStaged', { fg = c.vscGitStageModified, bg = 'NONE' })
+    hl(0, 'NeoTreeGitUntracked', { fg = c.vscGitUntracked, bg = 'NONE' })
+    hl(0, 'NeoTreeGitModified', { fg = c.vscGitModified, bg = 'NONE' })
+    hl(0, 'NeoTreeGitAdded', { fg = c.vscGitAdded, bg = 'NONE' })
 
     -- NeogitOrg/neogit
     if isDark then