diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 35e1990..738b07d 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -4,7 +4,6 @@
 require('blake.plugins')
 -- basic settings: ~/.config/nvim/lua/blake/settings.lua
 require('blake.settings')
-vim.cmd 'colorscheme tokyonight'
 
 -- TODO:
 -- Make plugins more modular
diff --git a/.config/nvim/lua/blake/plugins.lua b/.config/nvim/lua/blake/plugins.lua
index 2670462..85f633d 100644
--- a/.config/nvim/lua/blake/plugins.lua
+++ b/.config/nvim/lua/blake/plugins.lua
@@ -53,10 +53,12 @@ return require('packer').startup({function()
       config = function()
          -- vim.g.onedark_transparent_background = true
          vim.cmd [[
-            "au ColorScheme tokyonight hi TabLine gui=none guibg='#24283B' guifg='#5C6370'  " all tabs color
+            au ColorScheme tokyonight hi TabLine gui=none guibg='#1D202F' guifg='#565F89'  " all tabs color
             au ColorScheme tokyonight hi TabLineSel       guibg='#24283B' guifg='#C0CAF5'  " Highlighted tab color
-            "au ColorScheme tokyonight hi TabLineFill      guibg='#24283B'                  " tabline portion without tabs (right-hand side)
+            au ColorScheme tokyonight hi TabLineFill      guibg='#1D202F'                  " tabline portion without tabs (right-hand side)
          ]]
+         -- Has to be put here so it runs synchronously
+         vim.cmd 'colorscheme tokyonight'
       end,
    }
    use { -- newspring: Good light theme for writing
@@ -70,14 +72,10 @@ return require('packer').startup({function()
       end,
    }
    use { -- nvim-tabline
-      'seblj/nvim-tabline',
+      'alvarosevilla95/luatab.nvim',
       requires = 'kyazdani42/nvim-web-devicons',
       config = function()
-         require('tabline').setup {
-            -- Disable icons (and clickable buttons)
-            modified_icon = '',
-            close_icon = '',
-         }
+         require('luatab').setup()
       end
    }
    use { -- css color tag highlighter (ex: #FFB13B)