diff --git a/lua/general.lua b/lua/general.lua
index e5c6cbd..af17c2c 100644
--- a/lua/general.lua
+++ b/lua/general.lua
@@ -86,6 +86,5 @@ vim.filetype.add({
     },
 })
 vim.cmd [[
-    colorscheme gruvbox
     autocmd BufRead,BufNewFile *.tpl,*.gotmpl set ft=helm
 ]]
diff --git a/lua/lazy-load.lua b/lua/lazy-load.lua
index ed93035..7a40563 100644
--- a/lua/lazy-load.lua
+++ b/lua/lazy-load.lua
@@ -16,9 +16,6 @@ require("lazy").setup({
             priority = 400
         },
         -- neovim lsp plugins and depencencies
-        --{
-            --"folke/lazydev.nvim",
-        --},
         { 'hrsh7th/cmp-nvim-lsp' },
         { 'hrsh7th/cmp-buffer' },
         { 'hrsh7th/cmp-cmdline' },
@@ -61,9 +58,7 @@ require("lazy").setup({
         },
         {
             'folke/trouble.nvim',
-            opts = {},
             cmd = "Trouble",
-            --opts = require('plugins.trouble').config,
             keys = require("plugins.trouble").keys
         },
 
@@ -81,24 +76,15 @@ require("lazy").setup({
             'lewis6991/gitsigns.nvim',
             opts = require('plugins.gitsigns').config
         },
-        --{
-            --'petertriho/nvim-scrollbar',
-            --opts = {}
-        --},
         {
             'kevinhwang91/nvim-hlslens',
-            opts = {},
+            lazy = false,
             keys = require('plugins.hlslens').keys
         },
-        { 'L3MON4D3/LuaSnip',        version = '*' },
-        --{ 'saadparwaiz1/cmp_luasnip' },
-        {
-            'akinsho/bufferline.nvim',
-            version = '*',
-            opts = require('plugins.bufferline').config
-        },
+        { 'L3MON4D3/LuaSnip',     version = '*' },
         {
             'preservim/nerdcommenter',
+            lazy = false,
             keys = require('plugins.nerdcommenter').keys
         },
         {
@@ -116,31 +102,15 @@ require("lazy").setup({
             },
             opts = require('plugins.neogit').config
         },
-
-        --{ 'Glench/Vim-Jinja2-Syntax', priority = 15 },
-        --{ 'vmware-archive/salt-vim',  priority = 10 },
-        --{ 'stephpy/vim-yaml' }, -- for proper sls syntax highlighting when jinja
         {
             'lukas-reineke/indent-blankline.nvim',
             main = "ibl",
             init = require('plugins.indent-blankline').init
         },
-        --{ 'MunifTanjim/nui.nvim' },
-        --{
-            --'folke/noice.nvim',
-            --opts = require("plugins.noice").config,
-            --dependencies = {
-                --"MunifTanjim/nui.nvim",
-                ---- OPTIONAL:
-                ----   `nvim-notify` is only needed, if you want to use the notification view.
-                ----   If not available, we use `mini` as the fallback
-                ----"rcarriga/nvim-notify", }
-            --}
-        --},
         {
             'MeanderingProgrammer/markdown.nvim',
             main = "render-markdown",
-            opts = {},
+            lazy = false,
             name = 'render-markdown', -- Only needed if you have another plugin named markdown.nvim
             --dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.nvim' }, -- if you use the mini.nvim suite
             -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.icons' }, -- if you use standalone mini plugins
@@ -151,12 +121,17 @@ require("lazy").setup({
             opts = require('plugins.lualine').config
         },
         { 'RRethy/vim-illuminate' },
-        --{ 'sheerun/vim-polyglot' }, -- not maintained
         { 'nfnty/vim-nftables' },
-        --{ 'HiPhish/jinja.vim' },
-
         -- themes
-        { "ellisonleao/gruvbox.nvim", priority = 1000, config = true },
+        {
+            "ellisonleao/gruvbox.nvim",
+            lazy = false,
+            priority = 1000,
+            config = function()
+                -- load the colorscheme here
+                vim.cmd([[colorscheme gruvbox]])
+            end,
+        },
 
         --Fuzzy search by Telescope and its dependencies:
         {
diff --git a/lua/plugins/bufferline.lua b/lua/plugins/bufferline.lua
deleted file mode 100644
index 9f8a1cc..0000000
--- a/lua/plugins/bufferline.lua
+++ /dev/null
@@ -1,56 +0,0 @@
-return {
-    config = {
-        options = {
-            mode = "buffers", -- set to "tabs" to only show tabpages instead
-            themable = true, -- allows highlight groups to be overriden i.e. sets highlights as default
-            numbers =  "buffer_id",
-            close_command = "bdelete! %d",       -- can be a string | function, | false see "Mouse actions"
-            right_mouse_command = "bdelete! %d", -- can be a string | function | false, see "Mouse actions"
-            left_mouse_command = "buffer %d",    -- can be a string | function, | false see "Mouse actions"
-            middle_mouse_command = nil,          -- can be a string | function, | false see "Mouse actions"
-            indicator = {
-                icon = '▎', -- this should be omitted if indicator style is not 'icon'
-                style = 'icon',
-            },
-            buffer_close_icon = '󰅖',
-            modified_icon = '●',
-            close_icon = '',
-            left_trunc_marker = '',
-            right_trunc_marker = '',
-            max_name_length = 18,
-            max_prefix_length = 15, -- prefix used when a buffer is de-duplicated
-            truncate_names = true, -- whether or not tab names should be truncated
-            tab_size = 18,
-            diagnostics = "nvim_lsp",
-            diagnostics_update_in_insert = false,
-            offsets = {
-                {
-                    filetype = "NvimTree",
-                    text = "File Explorer",
-                    text_align = "left",
-                    separator = true
-                }
-            },
-            color_icons = true, -- whether or not to add the filetype icon highlights
-            show_buffer_icons = true, -- disable filetype icons for buffers
-            show_buffer_close_icons = false,
-            show_close_icon = false,
-            show_tab_indicators = true,
-            show_duplicate_prefix = true, -- whether to show duplicate buffer prefix
-            duplicates_across_groups = true, -- whether to consider duplicate paths in different groups as duplicates
-            persist_buffer_sort = true, -- whether or not custom sorted buffers should persist
-            move_wraps_at_ends = false, -- whether or not the move command "wraps" at the first or last position
-            -- can also be a table containing 2 custom separators
-            -- [focused and unfocused]. eg: { '|', '|' }
-            separator_style = "thick",
-            enforce_regular_tabs = true,
-            always_show_bufferline = true,
-            hover = {
-                enabled = true,
-                delay = 200,
-                reveal = {'close'}
-            },
-            sort_by = 'tabs'
-        }
-    }
-}
diff --git a/lua/plugins/nvim-lspconfig.lua b/lua/plugins/nvim-lspconfig.lua
index f53fa09..46f24df 100644
--- a/lua/plugins/nvim-lspconfig.lua
+++ b/lua/plugins/nvim-lspconfig.lua
@@ -121,8 +121,8 @@ return {
             capabilities = capabilities,
         }
         --require 'lspconfig'.pyright.setup {
-            --on_attach = on_attach,
-            --capabilities = capabilities,
+        --on_attach = on_attach,
+        --capabilities = capabilities,
         --}
         require 'lspconfig'.bashls.setup {
             on_attach = on_attach,