diff --git a/lua/plex/plugins/editor.lua b/lua/plex/plugins/editor.lua
index 45ee504..7e0b4c5 100644
--- a/lua/plex/plugins/editor.lua
+++ b/lua/plex/plugins/editor.lua
@@ -61,21 +61,4 @@ return {
 			wk.register(opts.defaults)
 		end,
 	},
-
-	-----------------------------------------------------------------------------
-	{
-		'folke/todo-comments.nvim',
-		dependencies = 'nvim-telescope/telescope.nvim',
-		-- stylua: ignore
-		keys = {
-			{ ']t', function() require('todo-comments').jump_next() end, desc = 'Next todo comment' },
-			{ '[t', function() require('todo-comments').jump_prev() end, desc = 'Previous todo comment' },
-			{ '<LocalLeader>dt', '<cmd>TodoTelescope<CR>', desc = 'todo' },
-			{ '<leader>xt', '<cmd>TodoTrouble<CR>', desc = 'Todo (Trouble)' },
-			{ '<leader>xT', '<cmd>TodoTrouble keywords=TODO,FIX,FIXME<cr>', desc = 'Todo/Fix/Fixme (Trouble)' },
-			{ '<leader>St', '<cmd>TodoTelescope<cr>', desc = 'Todo' },
-			{ '<leader>ST', '<cmd>TodoTelescope keywords=TODO,FIX,FIXME<cr>', desc = 'Todo/Fix/Fixme' },
-		},
-		opts = { signs = false },
-	},
 }
diff --git a/lua/plex/plugins/extras/coding/sandwich.lua b/lua/plex/plugins/extras/coding/sandwich.lua
deleted file mode 100644
index 29c14eb..0000000
--- a/lua/plex/plugins/extras/coding/sandwich.lua
+++ /dev/null
@@ -1,21 +0,0 @@
-return {
-	{
-		-- I dont get how this stuff works
-		'machakann/vim-sandwich',
-		enabled = false,
-		-- stylua: ignore
-		keys = {
-			-- See https://github.com/machakann/vim-sandwich/blob/master/macros/sandwich/keymap/surround.vim
-			{ '<leader>sd', '<Plug>(operator-sandwich-delete)<Plug>(operator-sandwich-release-count)<Plug>(textobj-sandwich-query-a)', silent = true },
-			{ '<leader>ssd', '<Plug>(operator-sandwich-delete)<Plug>(operator-sandwich-release-count)<Plug>(textobj-sandwich-auto-a)', silent = true },
-			{ '<leader>sc', '<Plug>(operator-sandwich-replace)<Plug>(operator-sandwich-release-count)<Plug>(textobj-sandwich-query-a)', silent = true },
-			{ '<leader>ssc', '<Plug>(operator-sandwich-replace)<Plug>(operator-sandwich-release-count)<Plug>(textobj-sandwich-auto-a)', silent = true },
-			{ '<leader>sa', '<Plug>(operator-sandwich-add)', silent = true, mode = { 'n', 'x', 'o' }},
-			{ '<leader>ir', '<Plug>(textobj-sandwich-auto-i)', silent = true, mode = { 'x', 'o' }},
-			{ '<leader>ab', '<Plug>(textobj-sandwich-auto-a)', silent = true, mode = { 'x', 'o' }},
-		},
-		init = function()
-			vim.g.sandwich_no_default_key_mappings = 1
-		end,
-	},
-}
diff --git a/lua/plex/plugins/extras/org/neorg.lua b/lua/plex/plugins/extras/org/neorg.lua
deleted file mode 100644
index 0b8bdd7..0000000
--- a/lua/plex/plugins/extras/org/neorg.lua
+++ /dev/null
@@ -1,28 +0,0 @@
-return {
-	{
-		"nvim-neorg/neorg",
-		enabled = false,
-		lazy = true,
-		build = ":Neorg sync-parsers",
-		dependencies = { "nvim-lua/plenary.nvim" },
-		config = function()
-			require("neorg").setup {
-				load = {
-					["core.defaults"] = {}, -- Loads default behaviour
-					["core.concealer"] = {}, -- Adds pretty icons to your documents
-					["core.export"] = {},
-					["core.dirman"] = { -- Manages Neorg workspaces
-						config = {
-							workspaces = {
-								-- FIXME: This shouldn't be in the Versioncontrol. Make this
-								-- into a local extension of the plugin.
-								main = "~/Nextcloud/Neorg",
-								notes = "~/Nextcloud/Notizen",
-							},
-						},
-					},
-				},
-			}
-		end,
-	},
-}
diff --git a/lua/plex/plugins/extras/ui/dashboard.lua b/lua/plex/plugins/extras/ui/dashboard.lua
deleted file mode 100644
index 49601fa..0000000
--- a/lua/plex/plugins/extras/ui/dashboard.lua
+++ /dev/null
@@ -1,85 +0,0 @@
-local function get_header()
-	-- see https://github.com/MaximilianLloyd/ascii.nvim
-	return {
-	-- The following is a customized version!
-	[[                                                                       ]],
-	[[                                           		 ██                    ]],
-	[[        █ ███████            █████   		 ██                    ]],
-	[[       ███ █████              █████                             ]],
-	[[      █████ ███ ███████████████████ ███   ███████████   ]],
-	[[     ██ ██ █ ███     █████████████ █████ ██████████████   ]],
-	[[    ████ ████ ██████████ █████████ █████ █████ ████ █████   ]],
-	[[   ██████ ██ ███     ███ █████████ █████ █████ ████ █████  ]],
-	[[  ████████  ██████████████████ ████ █████ █████ ████ ██████ ]],
-	[[                                                                       ]],
-	}
-end
-
-return {
-	{
-		'glepnir/dashboard-nvim',
-		event = 'VimEnter',
-		config = function()
-			require('dashboard').setup({
-
-				theme = 'hyper',
-				config = {
-					header = get_header(),
-					week_header = {
-						enable = false,
-					},
-					shortcut = {
-						{
-							desc = '󰊳 Update',
-							group = '@property',
-							action = 'Lazy update',
-							key = 'u'
-						},
-						{
-							icon = ' ',
-							icon_hl = '@variable',
-							desc = 'Files',
-							group = 'Label',
-							action = 'Telescope find_files',
-							key = 'f',
-						},
-						{
-							desc = ' Git',
-							group = 'Label',
-							action = function()
-								local Util = require('plex.lib.utils')
-								Util.float_term({ 'lazygit'}, { cwd = Util.get_root() })
-							end,
-							key = 'g',
-						},
-						{
-							desc = ' Neorg',
-							group = 'Number',
-							action = 'Neorg workspace main',
-							key = 'o',
-						},
-						{
-							desc = '󰘁 Sessions',
-							group = 'Number',
-							action = 'Telescope persisted',
-							key = 's',
-						},
-					},
-
-					project = {
-						enable = true,
-						limit = 8,
-						icon = '',
-						label = ' Projects',
-						action = 'Telescope find_files cwd='
-					},
-					packages = { enable = true},
-					mru = { limit = 10, icon = '', label = ' Last Edited'},
-					-- footer = { 'footer bar foo' },
-				},
-
-			})
-		end,
-		dependencies = { {'nvim-tree/nvim-web-devicons'}}
-	}
-}
diff --git a/lua/plex/plugins/treesitter.lua b/lua/plex/plugins/treesitter.lua
index 592534c..0d2d2b6 100644
--- a/lua/plex/plugins/treesitter.lua
+++ b/lua/plex/plugins/treesitter.lua
@@ -2,26 +2,6 @@
 -- https://github.com/rafi/vim-config
 
 return {
-
-	-----------------------------------------------------------------------------
-	-- Vimscript syntax/indent plugins
-	{ 'iloginow/vim-stylus', ft = 'stylus' },
-	{ 'chrisbra/csv.vim', ft = 'csv' },
-	{ 'mustache/vim-mustache-handlebars', ft = { 'mustache', 'handlebars' } },
-	{ 'lifepillar/pgsql.vim', ft = 'pgsql' },
-	{ 'MTDL9/vim-log-highlighting', ft = 'log' },
-	{ 'reasonml-editor/vim-reason-plus', ft = { 'reason', 'merlin' } },
-	{ 'vmchale/just-vim', ft = 'just' },
-
-	-----------------------------------------------------------------------------
-	{
-		'andymass/vim-matchup',
-		init = function()
-			vim.g.matchup_matchparen_offscreen = {}
-		end,
-	},
-
-	-----------------------------------------------------------------------------
 	{
 		'nvim-treesitter/nvim-treesitter',
 		event = { 'BufReadPost', 'BufNewFile' },
diff --git a/lua/plex/plugins/ui.lua b/lua/plex/plugins/ui.lua
index fc0893b..e0fcb84 100644
--- a/lua/plex/plugins/ui.lua
+++ b/lua/plex/plugins/ui.lua
@@ -6,7 +6,11 @@ return {
 	-----------------------------------------------------------------------------
 	{ 'nvim-tree/nvim-web-devicons', lazy = false },
 	{ 'MunifTanjim/nui.nvim', lazy = false },
-	{ 'rafi/tabstrip.nvim', lazy = false, priority = 98, opts = true },
+	{
+		'akinsho/bufferline.nvim', lazy = false, version = "*",
+		dependencies = 'nvim-tree/nvim-web-devicons'
+	},
+
 
 	-----------------------------------------------------------------------------
 	{