diff --git a/.config/kitty/color_schemes/github_dimmed.conf b/.config/kitty/color_schemes/github_dimmed.conf
new file mode 100644
index 0000000..c640cec
--- /dev/null
+++ b/.config/kitty/color_schemes/github_dimmed.conf
@@ -0,0 +1,44 @@
+# github colors for Kitty
+# upstream: https://github.com/projekt0n/github-theme-contrib/
+
+background #22272e
+foreground #c0cbec
+selection_background #264466
+selection_foreground #768390
+url_color #768390
+cursor #6cb6ff
+cursor_text_color background
+
+# Tabs
+active_tab_background #539bf5
+active_tab_foreground #1e2228
+inactive_tab_background #636e7b
+inactive_tab_foreground #1e2228
+
+# Windows Border
+active_border_color #444c56
+inactive_border_color #444c56
+
+# normal
+color0 #545d68
+color1 #f47067
+color2 #57ab5a
+color3 #c69026
+color4 #539bf5
+color5 #b083f0
+color6 #39c5cf
+color7 #909dab
+
+# bright
+color8 #636e7b
+color9 #ff938a
+color10 #6bc46d
+color11 #daaa3f
+color12 #6cb6ff
+color13 #dcbdfb
+color14 #56d4dd
+color15 #cdd9e5
+
+# extended colors
+color16 #daaa3f
+color17 #ff938a
diff --git a/.config/kitty/color_schemes/tokyo_night_moon.conf b/.config/kitty/color_schemes/tokyo_night_moon.conf
new file mode 100644
index 0000000..cbda2a0
--- /dev/null
+++ b/.config/kitty/color_schemes/tokyo_night_moon.conf
@@ -0,0 +1,50 @@
+# vim:ft=kitty
+
+## name: Tokyo Night Moon
+## license: MIT
+## author: Folke Lemaitre
+## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_moon.conf
+
+
+background #222436
+foreground #c8d3f5
+selection_background #3654a7
+selection_foreground #c8d3f5
+url_color #4fd6be
+cursor #c8d3f5
+cursor_text_color #222436
+
+# Tabs
+active_tab_background #82aaff
+active_tab_foreground #1e2030
+inactive_tab_background #2f334d
+inactive_tab_foreground #545c7e
+#tab_bar_background #1b1d2b
+
+# Windows
+active_border_color #82aaff
+inactive_border_color #2f334d
+
+# normal
+color0 #1b1d2b
+color1 #ff757f
+color2 #c3e88d
+color3 #ffc777
+color4 #82aaff
+color5 #c099ff
+color6 #84a1be
+color7 #828bb8
+
+# bright
+color8 #444a73
+color9 #ff757f
+color10 #c3e88d
+color11 #ffc777
+color12 #82aaff
+color13 #c099ff
+color14 #84a1be
+color15 #c8d3f5
+
+# extended colors
+color16 #ff5252
+color17 #c53b53
diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index 87697fe..ded9def 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -48,56 +48,8 @@ active_border_color #C0C0C0
 
 #: Colorscheme {{{
 
-# vim:ft=kitty
-
-## name: Tokyo Night Moon
-## license: MIT
-## author: Folke Lemaitre
-## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_moon.conf
-
-
-background #222436
-foreground #c8d3f5
-selection_background #3654a7
-selection_foreground #c8d3f5
-url_color #4fd6be
-cursor #c8d3f5
-cursor_text_color #222436
-
-# Tabs
-active_tab_background #82aaff
-active_tab_foreground #1e2030
-inactive_tab_background #2f334d
-inactive_tab_foreground #545c7e
-#tab_bar_background #1b1d2b
-
-# Windows
-active_border_color #82aaff
-inactive_border_color #2f334d
-
-# normal
-color0 #1b1d2b
-color1 #ff757f
-color2 #c3e88d
-color3 #ffc777
-color4 #82aaff
-color5 #c099ff
-color6 #84a1be
-color7 #828bb8
-
-# bright
-color8 #444a73
-color9 #ff757f
-color10 #c3e88d
-color11 #ffc777
-color12 #82aaff
-color13 #c099ff
-color14 #84a1be
-color15 #c8d3f5
-
-# extended colors
-color16 #ff5252
-color17 #c53b53
+#include color_schemes/tokyo_night_moon.conf
+include color_schemes/github_dimmed.conf
 
 #: }}}
 
diff --git a/.config/nvim/lua/core/plugins.lua b/.config/nvim/lua/core/plugins.lua
index 80306da..8ddc7c9 100644
--- a/.config/nvim/lua/core/plugins.lua
+++ b/.config/nvim/lua/core/plugins.lua
@@ -43,10 +43,27 @@ lazy.setup({
 					colors.gitSigns.change = "#779be9"
 				end,
 			})
-
-			vim.cmd([[colorscheme tokyonight]])
 		end,
 	},
+	{
+		"projekt0n/github-nvim-theme",
+		lazy = false,
+		priorrity = 1000,
+		version = "v0.0.x",
+		config = function()
+			require("github-theme").setup({
+				colors = {
+					error = "#dd6861",
+					-- fg = "#c8d3f5",
+					-- syntax = {
+					-- 	comment = "#636da6",
+					-- },
+				},
+			})
+			vim.cmd([[colorscheme github_dimmed]])
+		end,
+	},
+
 	-- Plugins
 	{ "nvim-lua/plenary.nvim", lazy = true },
 	{ "echasnovski/mini.starter", lazy = "VimEnter", version = "*" },
diff --git a/.config/nvim/lua/plugins/neo-tree.lua b/.config/nvim/lua/plugins/neo-tree.lua
index 19b93aa..5f4af34 100644
--- a/.config/nvim/lua/plugins/neo-tree.lua
+++ b/.config/nvim/lua/plugins/neo-tree.lua
@@ -7,6 +7,7 @@ vim.g.neo_tree_remove_legacy_commands = true
 
 neotree.setup({
 	close_if_last_window = true,
+	open_files_do_not_replace_filetypes = { "terminal", "trouble", "qf", "starter" }, -- when opening files, do not use windows containing these filetypes
 	popup_border_style = "rounded",
 	default_component_configs = {
 		indent = {