diff --git a/dmitmel-dotfiles b/dmitmel-dotfiles
index fbe9dab..bf96e55 160000
--- a/dmitmel-dotfiles
+++ b/dmitmel-dotfiles
@@ -1 +1 @@
-Subproject commit fbe9dab3e36f272c910143dd72bf4e8ae4c627df
+Subproject commit bf96e553764e3a166286f5a6a8017e01dadcf6f9
diff --git a/nvim/plugin/lualine.lua b/nvim/plugin/lualine.lua
index f7290ee..d281582 100644
--- a/nvim/plugin/lualine.lua
+++ b/nvim/plugin/lualine.lua
@@ -1,26 +1,34 @@
 local dotfiles_gruv = require'lualine.themes.gruvbox'
-local colors = vim.g.dotfiles_colorscheme_base16_colors
+local theme = require'dotfiles.colorscheme'
+
+-- https://github.com/dmitmel/dotfiles/commit/bf96e553764e3a166286f5a6a8017e01dadcf6f9
+-- https://ptb.discord.com/channels/382339402338402315/382339402338402317/885864846892077086
+function get_color(index)
+  local color = theme.base16_colors[index]
+  local r, g, b = unpack(color, 1, 3)
+  return string.format('#%02x%02x%02x', r, g, b)
+end
 
 -- Structure of themes is as follows:
 -- a: Outer components, such as `NORMAL` text and line counts
 -- b: secondary components, such git branch info
 -- c: Middle components, basically everything in the middle
 
-dotfiles_gruv.normal.a.bg = colors[12].gui
+dotfiles_gruv.normal.a.bg = get_color(12)
 
-dotfiles_gruv.insert.a.bg = colors[14].gui
-dotfiles_gruv.insert.c.bg = colors[2].gui
+dotfiles_gruv.insert.a.bg = get_color(14)
+dotfiles_gruv.insert.c.bg = get_color(2)
 
-dotfiles_gruv.visual.a.bg = colors[15].gui
-dotfiles_gruv.visual.c.bg = colors[2].gui
-dotfiles_gruv.visual.c.fg = colors[7].gui
+dotfiles_gruv.visual.a.bg = get_color(15)
+dotfiles_gruv.visual.c.bg = get_color(2)
+dotfiles_gruv.visual.c.fg = get_color(7)
 
-dotfiles_gruv.command.a.bg = colors[16].gui
-dotfiles_gruv.command.c.bg = colors[2].gui
-dotfiles_gruv.command.c.fg = colors[7].gui
+dotfiles_gruv.command.a.bg = get_color(16)
+dotfiles_gruv.command.c.bg = get_color(2)
+dotfiles_gruv.command.c.fg = get_color(7)
 
-dotfiles_gruv.replace.a.bg = colors[9].gui
-dotfiles_gruv.replace.c.bg = colors[2].gui
+dotfiles_gruv.replace.a.bg = get_color(9)
+dotfiles_gruv.replace.c.bg = get_color(2)
 
 -- Displays the currently selected Arduino board
 local function showBoard()