diff --git a/init.lua b/init.lua
index 1fc22bb..e266838 100644
--- a/init.lua
+++ b/init.lua
@@ -1,3 +1,8 @@
+-- nvim-tree:
+-- It is strongly advised to eagerly disable netrw, due to race conditions at vim
+vim.g.loaded_netrw = 1
+vim.g.loaded_netrwPlugin = 1
+
 require("config.lazy")
 require("config.remap")
 
diff --git a/lua/config/remap.lua b/lua/config/remap.lua
index a62d4e1..0a7b489 100644
--- a/lua/config/remap.lua
+++ b/lua/config/remap.lua
@@ -15,8 +15,8 @@ vim.keymap.set("n", "<leader>n", "<CMD>Oil<CR>", { desc = "Open parent directory
 
 -- barbar keymaps
 -- Move to previous/next
-vim.keymap.set("n", "<Tab>", "<Cmd>BufferPrevious<CR>")
-vim.keymap.set("n", "<S-Tab>", "<Cmd>BufferNext<CR>")
+vim.keymap.set("n", "<Tab>", "<Cmd>BufferNext<CR>")
+vim.keymap.set("n", "<S-Tab>", "<Cmd>BufferPrevious<CR>")
 -- Re-order to previous/next
 vim.keymap.set("n", "<C-,>", "<Cmd>BufferMovePrevious<CR>")
 vim.keymap.set("n", "<C-.>", "<Cmd>BufferMoveNext<CR>")
@@ -71,3 +71,23 @@ vim.keymap.set("i", "<C-k>", "<Up>", { noremap = true })
 vim.keymap.set("i", "<C-j>", "<Down>", { noremap = true })
 vim.keymap.set("i", "<C-h>", "<Left>", { noremap = true })
 vim.keymap.set("i", "<C-l>", "<Right>", { noremap = true })
+
+-- recommended mappings
+-- resizing splits
+-- these keymaps will also accept a range,
+-- for example `10<A-h>` will `resize_left` by `(10 * config.default_amount)`
+vim.keymap.set("n", "<A-h>", require("smart-splits").resize_left)
+vim.keymap.set("n", "<A-j>", require("smart-splits").resize_down)
+vim.keymap.set("n", "<A-k>", require("smart-splits").resize_up)
+vim.keymap.set("n", "<A-l>", require("smart-splits").resize_right)
+-- moving between splits
+vim.keymap.set("n", "<C-h>", require("smart-splits").move_cursor_left)
+vim.keymap.set("n", "<C-j>", require("smart-splits").move_cursor_down)
+vim.keymap.set("n", "<C-k>", require("smart-splits").move_cursor_up)
+vim.keymap.set("n", "<C-l>", require("smart-splits").move_cursor_right)
+vim.keymap.set("n", "<C-\\>", require("smart-splits").move_cursor_previous)
+-- swapping buffers between windows
+vim.keymap.set("n", "<leader><leader>h", require("smart-splits").swap_buf_left)
+vim.keymap.set("n", "<leader><leader>j", require("smart-splits").swap_buf_down)
+vim.keymap.set("n", "<leader><leader>k", require("smart-splits").swap_buf_up)
+vim.keymap.set("n", "<leader><leader>l", require("smart-splits").swap_buf_right)
diff --git a/lua/main/init.lua b/lua/main/init.lua
index 6d18225..0623412 100644
--- a/lua/main/init.lua
+++ b/lua/main/init.lua
@@ -2,6 +2,9 @@
 vim.g.moonflyTransparent = true
 -- vim.cmd([[colorscheme moonfly]])
 
+-- set termguicolors, needed for the colorizer
+vim.opt.termguicolors = true
+
 vim.opt["tabstop"] = 4
 vim.opt["shiftwidth"] = 4
 
diff --git a/lua/plugins/colorizer.lua b/lua/plugins/colorizer.lua
new file mode 100644
index 0000000..30a6904
--- /dev/null
+++ b/lua/plugins/colorizer.lua
@@ -0,0 +1,8 @@
+return {
+	"norcalli/nvim-colorizer.lua",
+	opts = {},
+	config = function()
+		vim.opt.termguicolors = true
+		require("colorizer").setup()
+	end,
+}
diff --git a/lua/plugins/themes.lua b/lua/plugins/themes.lua
index dee3e66..b831579 100644
--- a/lua/plugins/themes.lua
+++ b/lua/plugins/themes.lua
@@ -4,7 +4,15 @@ return {
 		lazy = false, -- make sure we load this during startup if it is your main colorscheme
 		priority = 1000, -- make sure to load this before all the other start plugins
 	},
-	{ "miikanissi/modus-themes.nvim" },
+	{
+		"miikanissi/modus-themes.nvim",
+		config = function()
+			require("modus-themes").setup({
+				variant = "tinted",
+				transparent = true,
+			})
+		end,
+	},
 	{
 		"f-person/auto-dark-mode.nvim",
 		opts = {
diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua
index 158767c..82729dc 100644
--- a/lua/plugins/ui.lua
+++ b/lua/plugins/ui.lua
@@ -14,6 +14,10 @@ return {
 			})
 		end,
 	},
+	{
+		"mrjones2014/smart-splits.nvim",
+		build = "./kitty/install-kittens.bash",
+	},
 	{
 		"nvim-tree/nvim-tree.lua",
 		version = "*",
@@ -22,7 +26,12 @@ return {
 			"nvim-tree/nvim-web-devicons",
 		},
 		config = function()
-			require("nvim-tree").setup({})
+			require("nvim-tree").setup({
+				diagnostics = {
+					enable = true,
+					show_on_dirs = true,
+				},
+			})
 		end,
 	},
 	{