diff --git a/neovim/.config/nvim/init.lua b/neovim/.config/nvim/init.lua
index e40f8cd..5666e8a 100644
--- a/neovim/.config/nvim/init.lua
+++ b/neovim/.config/nvim/init.lua
@@ -138,8 +138,8 @@ map('n', '<leader>ft', ':Telescope treesitter<CR>', optsWithDesc("search treesit
 --Treesitter context
 map('n', '<leader>c', ':TSContextToggle<CR>', optsWithDesc("toggle ts context"))
 --tabline stuff (gt and gT are prev/next tab in stock vim)
-map('n', 'gf', ':TablineBufferNext<CR>', optsWithDesc("next buffer"))
-map('n', 'gF', ':TablineBufferPrevious<CR>', optsWithDesc("prev buffer"))
+map('n', 'gf', ':bnext<CR>', optsWithDesc("next buffer"))
+map('n', 'gF', ':bprevious<CR>', optsWithDesc("prev buffer"))
 --gitsigns
 map('n', '<leader>bl', ':Gitsigns toggle_current_line_blame<CR>', optsWithDesc("toggle inline git blame"))
 -- toggle keymappings for venn using <leader>v
diff --git a/neovim/.config/nvim/lua/.luarc.json b/neovim/.config/nvim/lua/.luarc.json
new file mode 100644
index 0000000..59bdf1f
--- /dev/null
+++ b/neovim/.config/nvim/lua/.luarc.json
@@ -0,0 +1,6 @@
+{
+    "diagnostics.globals": [
+        "vim",
+        "rainbow_delimiters"
+    ]
+}
\ No newline at end of file
diff --git a/neovim/.config/nvim/lua/packages.lua b/neovim/.config/nvim/lua/packages.lua
index 15eef4e..477f864 100644
--- a/neovim/.config/nvim/lua/packages.lua
+++ b/neovim/.config/nvim/lua/packages.lua
@@ -211,7 +211,7 @@ require('lazy').setup({
 			sections = {
 				lualine_a = { 'mode' },
 				lualine_b = { 'branch', 'diff', 'diagnostics' },
-				lualine_c = { 'filename' },
+				lualine_c = { { 'filename', path = 1, } },
 				lualine_x = { 'encoding', 'fileformat', 'filetype' },
 				lualine_y = { 'progress' },
 				lualine_z = { 'location' }
@@ -224,35 +224,34 @@ require('lazy').setup({
 				lualine_y = {},
 				lualine_z = {}
 			},
+			tabline = {
+				lualine_a = { { 'buffers', mode = 4 } },
+				lualine_b = {},
+				lualine_c = {},
+				lualine_x = {},
+				lualine_y = {},
+				lualine_z = { { 'tabs', mode = 2 } }
+			},
+			winbar = {
+				lualine_a = {},
+				lualine_b = {},
+				lualine_c = {},
+				lualine_x = {},
+				lualine_y = {},
+				lualine_z = {}
+			},
+			inactive_winbar = {
+				lualine_a = {},
+				lualine_b = {},
+				lualine_c = {},
+				lualine_x = {},
+				lualine_y = {},
+				lualine_z = {}
+			},
 			extensions = {}
 		},
 
 	},
-	{
-		'kdheepak/tabline.nvim',
-		dependencies = { 'nvim-lualine/lualine.nvim' },
-		config = function()
-			require 'tabline'.setup {
-				-- Defaults configuration options
-				enable = true,
-				options = {
-					-- If lualine is installed tabline will use separators configured in lualine by default.
-					-- These options can be used to override those settings.
-					-- section_separators = {'', ''},
-					-- component_separators = {'', ''},
-					-- max_bufferline_percent = 66, -- set to nil by default, and it uses vim.o.columns * 2/3
-					show_tabs_always = false, -- this shows tabs only when there are more than one tab or if the first tab is named
-					show_devicons = true, -- this shows devicons in buffer section
-					show_bufnr = true, -- this appends [bufnr] to buffer section,
-					show_filename_only = false, -- shows base filename only instead of relative path in filename
-				}
-			}
-			vim.cmd [[
-	set guioptions-=e " Use showtabline in gui vim
-	set sessionoptions+=tabpages,globals " store tabpages and globals in session
-	]]
-		end,
-	},
 	{
 		'romgrk/nvim-treesitter-context',
 		dependencies = { 'nvim-treesitter/nvim-treesitter' },
@@ -268,6 +267,31 @@ require('lazy').setup({
 			separator = nil,
 		}
 	},
+	{
+		'hiphish/rainbow-delimiters.nvim',
+		dependencies = { 'nvim-treesitter/nvim-treesitter' },
+		config = function()
+			local rainbow_delimiters = require 'rainbow-delimiters'
+			vim.g.rainbow_delimiters = {
+				strategy = {
+					[''] = rainbow_delimiters.strategy['global'],
+				},
+				query = {
+					[''] = 'rainbow-delimiters',
+					lua = 'rainbow-blocks',
+				},
+				highlight = {
+					'RainbowDelimiterRed',
+					'RainbowDelimiterViolet',
+					'RainbowDelimiterCyan',
+					'RainbowDelimiterYellow',
+					'RainbowDelimiterBlue',
+					'RainbowDelimiterOrange',
+					'RainbowDelimiterGreen',
+				}
+			}
+		end
+	},
 	{
 		"lukas-reineke/indent-blankline.nvim",
 		main = "ibl",
@@ -277,16 +301,14 @@ require('lazy').setup({
 		'lewis6991/gitsigns.nvim',
 		config = true,
 	},
-	'chentau/marks.nvim',
+	{'chentoast/marks.nvim',
+		config=true
+	},
 	'sitiom/nvim-numbertoggle',
 	{
 		'numToStr/Comment.nvim',
 		config = true,
 	},
-	-- {
-	-- 	"tversteeg/registers.nvim",
-	-- 	config = true,
-	-- },
 	{
 		'Wansmer/treesj',
 		dependencies = { 'nvim-treesitter' },