diff --git a/lua/integrations/devicons.lua b/lua/integrations/devicons.lua
index 35e0a10..661e54c 100644
--- a/lua/integrations/devicons.lua
+++ b/lua/integrations/devicons.lua
@@ -1,30 +1,31 @@
 local colors = require("base46").get_colors "base_30"
 
 return {
-   DevIconc = { bg = "NONE", fg = colors.blue },
-   DevIconcss = { bg = "NONE", fg = colors.blue },
-   DevIcondeb = { bg = "NONE", fg = colors.cyan },
-   DevIconDockerfile = { bg = "NONE", fg = colors.cyan },
-   DevIconhtml = { bg = "NONE", fg = colors.baby_pink },
-   DevIconjpeg = { bg = "NONE", fg = colors.dark_purple },
-   DevIconjpg = { bg = "NONE", fg = colors.dark_purple },
-   DevIconjs = { bg = "NONE", fg = colors.sun },
-   DevIconkt = { bg = "NONE", fg = colors.orange },
-   DevIconlock = { bg = "NONE", fg = colors.red },
-   DevIconlua = { bg = "NONE", fg = colors.blue },
-   DevIconmp3 = { bg = "NONE", fg = colors.white },
-   DevIconmp4 = { bg = "NONE", fg = colors.white },
-   DevIconout = { bg = "NONE", fg = colors.white },
-   DevIconpng = { bg = "NONE", fg = colors.dark_purple },
-   DevIconpy = { bg = "NONE", fg = colors.cyan },
-   DevIcontoml = { bg = "NONE", fg = colors.blue },
-   DevIconts = { bg = "NONE", fg = colors.teal },
-   DevIconttf = { bg = "NONE", fg = colors.white },
-   DevIconrb = { bg = "NONE", fg = colors.pink },
-   DevIconrpm = { bg = "NONE", fg = colors.orange },
-   DevIconvue = { bg = "NONE", fg = colors.vibrant_green },
-   DevIconwoff = { bg = "NONE", fg = colors.white },
-   DevIconwoff2 = { bg = "NONE", fg = colors.white },
-   DevIconxz = { bg = "NONE", fg = colors.sun },
-   DevIconzip = { bg = "NONE", fg = colors.sun },
+   DevIconDefault = { fg = colors.red },
+   DevIconc = { fg = colors.blue },
+   DevIconcss = { fg = colors.blue },
+   DevIcondeb = { fg = colors.cyan },
+   DevIconDockerfile = { fg = colors.cyan },
+   DevIconhtml = { fg = colors.baby_pink },
+   DevIconjpeg = { fg = colors.dark_purple },
+   DevIconjpg = { fg = colors.dark_purple },
+   DevIconjs = { fg = colors.sun },
+   DevIconkt = { fg = colors.orange },
+   DevIconlock = { fg = colors.red },
+   DevIconlua = { fg = colors.blue },
+   DevIconmp3 = { fg = colors.white },
+   DevIconmp4 = { fg = colors.white },
+   DevIconout = { fg = colors.white },
+   DevIconpng = { fg = colors.dark_purple },
+   DevIconpy = { fg = colors.cyan },
+   DevIcontoml = { fg = colors.blue },
+   DevIconts = { fg = colors.teal },
+   DevIconttf = { fg = colors.white },
+   DevIconrb = { fg = colors.pink },
+   DevIconrpm = { fg = colors.orange },
+   DevIconvue = { fg = colors.vibrant_green },
+   DevIconwoff = { fg = colors.white },
+   DevIconwoff2 = { fg = colors.white },
+   DevIconxz = { fg = colors.sun },
+   DevIconzip = { fg = colors.sun },
 }
diff --git a/lua/integrations/feline.lua b/lua/integrations/feline.lua
deleted file mode 100644
index da00669..0000000
--- a/lua/integrations/feline.lua
+++ /dev/null
@@ -1,143 +0,0 @@
-local colors = require("base46").get_colors "base_30"
-
-return {
-
-   Feline = {
-      fg = colors.grey_fg2,
-      bg = colors.statusline_bg,
-   },
-
-   FelineIcon = {
-      fg = colors.statusline_bg,
-      bg = colors.nord_blue,
-   },
-
-   FelineIconSeparator = {
-      fg = colors.nord_blue,
-      bg = colors.grey,
-   },
-
-   FelineCwd = {
-      fg = colors.red,
-      bg = colors.statusline_bg,
-   },
-
-   Feline_diffIcons = {
-      fg = colors.light_grey,
-      bg = colors.statusline_bg,
-   },
-
-   -- LSP
-
-   Feline_lspError = {
-      fg = colors.red,
-      bg = colors.statusline_bg,
-   },
-
-   Feline_lspWarning = {
-      fg = colors.yellow,
-      bg = colors.statusline_bg,
-   },
-
-   Feline_LspHints = {
-      fg = colors.purple,
-      bg = colors.statusline_bg,
-   },
-
-   Feline_LspInfo = {
-      fg = colors.green,
-      bg = colors.statusline_bg,
-   },
-
-   Feline_LspIcon = {
-      fg = colors.teal,
-      bg = colors.statusline_bg,
-   },
-
-   Feline_LspProgress = {
-      fg = colors.green,
-      bg = colors.statusline_bg,
-   },
-
-   -- MODES
-
-   Feline_NormalMode = {
-      fg = colors.nord_blue,
-      bg = colors.lightbg,
-   },
-
-   Feline_InsertMode = {
-      fg = colors.dark_purple,
-      bg = colors.lightbg,
-   },
-
-   Feline_TerminalMode = {
-      fg = colors.green,
-      bg = colors.lightbg,
-   },
-
-   Feline_VisualMode = {
-      fg = colors.cyan,
-      bg = colors.lightbg,
-   },
-
-   Feline_ReplaceMode = {
-      fg = colors.orange,
-      bg = colors.lightbg,
-   },
-
-   Feline_ConfirmMode = {
-      fg = colors.teal,
-      bg = colors.lightbg,
-   },
-
-   Feline_CommandMode = {
-      fg = colors.pink,
-      bg = colors.lightbg,
-   },
-
-   Feline_SelectMode = {
-      fg = colors.nord_blue,
-      bg = colors.lightbg,
-   },
-
-   Feline_EmptySpace = {
-      fg = colors.grey,
-      bg = colors.lightbg,
-   },
-
-   Feline_file_info = {
-      bg = colors.nord_blue,
-      fg = colors.lightbg,
-   },
-
-   Feline_file_info_sep = {
-      fg = colors.nord_blue,
-      bg = colors.grey,
-   },
-
-   Feline_nvim_gps = {
-      fg = colors.purple,
-      bg = colors.statusline_bg,
-   },
-
-   Feline_time = {
-      fg = colors.red,
-      bg = colors.lightbg,
-   },
-
-   Feline_CurrentLine = {
-      fg = colors.green,
-      bg = colors.lightbg,
-   },
-
-   Feline_PositionIcon = {
-      fg = colors.black,
-      bg = colors.green,
-   },
-
-   Feline_PositionSeparator = {
-      fg = colors.green,
-      bg = colors.grey,
-   },
-}
diff --git a/lua/integrations/gps.lua b/lua/integrations/gps.lua
new file mode 100644
index 0000000..4e795d7
--- /dev/null
+++ b/lua/integrations/gps.lua
@@ -0,0 +1,40 @@
+local base16 = require("base46").get_colors "base_16"
+local colors = require("base46").get_colors "base_30"
+
+return {
+   -- nvim Gps
+   GpsItemAbbr = { fg = colors.white, bg = colors.statusline_bg },
+   GpsItemAbbrMatch = { fg = colors.blue, bold = true, bg = colors.statusline_bg },
+   GpsBorder = { fg = colors.grey, bg = colors.statusline_bg },
+   GpsDocBorder = { fg = colors.grey, bg = colors.statusline_bg },
+
+   -- Gps item kinds
+   GpsItemKindConstant = { fg = base16.base09, bg = colors.statusline_bg },
+   GpsItemKindFunction = { fg = base16.base0D, bg = colors.statusline_bg },
+   GpsItemKindIdentifier = { fg = base16.base08, bg = colors.statusline_bg },
+   GpsItemKindField = { fg = base16.base08, bg = colors.statusline_bg },
+   GpsItemKindVariable = { fg = base16.base0E, bg = colors.statusline_bg },
+   GpsItemKindSnippet = { fg = colors.red, bg = colors.statusline_bg },
+   GpsItemKindText = { fg = base16.base0B, bg = colors.statusline_bg },
+   GpsItemKindStructure = { fg = base16.base0E, bg = colors.statusline_bg },
+   GpsItemKindType = { fg = base16.base0A, bg = colors.statusline_bg },
+   GpsItemKindKeyword = { fg = base16.base07, bg = colors.statusline_bg },
+   GpsItemKindMethod = { fg = base16.base0D, bg = colors.statusline_bg },
+   GpsItemKindConstructor = { fg = colors.blue, bg = colors.statusline_bg },
+   GpsItemKindFolder = { fg = base16.base07, bg = colors.statusline_bg },
+   GpsItemKindModule = { fg = base16.base0A, bg = colors.statusline_bg },
+   GpsItemKindProperty = { fg = base16.base08, bg = colors.statusline_bg },
+   -- GpsItemKindEnum = { fg = "", bg = colors.statusline_bg},
+   GpsItemKindUnit = { fg = base16.base0E, bg = colors.statusline_bg },
+   -- GpsItemKindClass = { fg = "", bg = colors.statusline_bg},
+   GpsItemKindFile = { fg = base16.base07, bg = colors.statusline_bg },
+   -- GpsItemKindInterface = { fg = "", bg = colors.statusline_bg},
+   GpsItemKindColor = { fg = colors.red, bg = colors.statusline_bg },
+   GpsItemKindReference = { fg = base16.base05, bg = colors.statusline_bg },
+   -- GpsItemKindEnumMember = { fg = "", bg = colors.statusline_bg},
+   GpsItemKindStruct = { fg = base16.base0E, bg = colors.statusline_bg },
+   -- GpsItemKindValue = { fg = "", bg = colors.statusline_bg},
+   -- GpsItemKindEvent = { fg = "", bg = colors.statusline_bg},
+   GpsItemKindOperator = { fg = base16.base05, bg = colors.statusline_bg },
+   GpsItemKindTypeParameter = { fg = base16.base08, bg = colors.statusline_bg },
+}
diff --git a/lua/integrations/misc.lua b/lua/integrations/misc.lua
index 7a836ab..cdb5052 100644
--- a/lua/integrations/misc.lua
+++ b/lua/integrations/misc.lua
@@ -141,12 +141,7 @@ return {
    },
 
    CursorLine = {
-      bg = theme.base00,
-      sp = "none",
-   },
-
-   CursorLineNr = {
-      bg = theme.base00,
+      bg = "none",
       sp = "none",
    },
 
@@ -155,11 +150,6 @@ return {
       sp = "none",
    },
 
-   StatusLine = {
-      bg = "NONE",
-      sp = "none",
-   },
-
    -- spell
 
    SpellBad = {
diff --git a/lua/integrations/statusline.lua b/lua/integrations/statusline.lua
new file mode 100644
index 0000000..fe23a18
--- /dev/null
+++ b/lua/integrations/statusline.lua
@@ -0,0 +1,208 @@
+local colors = require("base46").get_colors "base_30"
+
+return {
+
+   StatusLine = {
+      bg = colors.statusline_bg,
+   },
+
+   St_gitIcons = {
+      fg = colors.light_grey,
+      bg = colors.statusline_bg,
+      bold = true,
+   },
+
+   -- LSP
+
+   St_lspError = {
+      fg = colors.red,
+      bg = colors.statusline_bg,
+   },
+
+   St_lspWarning = {
+      fg = colors.yellow,
+      bg = colors.statusline_bg,
+   },
+
+   St_LspHints = {
+      fg = colors.purple,
+      bg = colors.statusline_bg,
+   },
+
+   St_LspInfo = {
+      fg = colors.green,
+      bg = colors.statusline_bg,
+   },
+
+   St_LspStatus = {
+      fg = colors.nord_blue,
+      bg = colors.statusline_bg,
+   },
+
+   St_LspProgress = {
+      fg = colors.green,
+      bg = colors.statusline_bg,
+   },
+
+   St_LspStatus_Icon = {
+      fg = colors.black,
+      bg = colors.nord_blue,
+   },
+
+   -- MODES
+
+   St_NormalMode = {
+      bg = colors.nord_blue,
+      fg = colors.black,
+      bold = true,
+   },
+
+   St_InsertMode = {
+      bg = colors.dark_purple,
+      fg = colors.black,
+
+      bold = true,
+   },
+
+   St_TerminalMode = {
+      bg = colors.green,
+      fg = colors.black,
+      bold = true,
+   },
+
+   St_NTerminalMode = {
+      bg = colors.yellow,
+      fg = colors.black,
+      bold = true,
+   },
+
+   St_VisualMode = {
+      bg = colors.cyan,
+      fg = colors.black,
+      bold = true,
+   },
+
+   St_ReplaceMode = {
+      bg = colors.orange,
+      fg = colors.black,
+
+      bold = true,
+   },
+
+   St_ConfirmMode = {
+      bg = colors.teal,
+      fg = colors.black,
+
+      bold = true,
+   },
+
+   St_CommandMode = {
+      bg = colors.green,
+      fg = colors.black,
+
+      bold = true,
+   },
+
+   St_SelectMode = {
+      bg = colors.nord_blue,
+      fg = colors.black,
+
+      bold = true,
+   },
+
+   -- Separators for mode
+   St_NormalModeSep = {
+      fg = colors.nord_blue,
+      bg = colors.grey,
+   },
+
+   St_InsertModeSep = {
+      fg = colors.dark_purple,
+      bg = colors.grey,
+   },
+
+   St_TerminalModeSep = {
+      fg = colors.green,
+      bg = colors.grey,
+   },
+
+   St_NTerminalModeSep = {
+      fg = colors.yellow,
+      bg = colors.grey,
+   },
+
+   St_VisualModeSep = {
+      fg = colors.cyan,
+      bg = colors.grey,
+   },
+
+   St_ReplaceModeSep = {
+      fg = colors.orange,
+      bg = colors.grey,
+   },
+
+   St_ConfirmModeSep = {
+      fg = colors.teal,
+      bg = colors.grey,
+   },
+
+   St_CommandModeSep = {
+      fg = colors.green,
+      bg = colors.grey,
+   },
+
+   St_SelectModeSep = {
+      fg = colors.nord_blue,
+      bg = colors.grey,
+   },
+
+   St_EmptySpace = {
+      fg = colors.grey,
+      bg = colors.lightbg,
+   },
+
+   St_EmptySpace2 = {
+      fg = colors.grey,
+      bg = colors.statusline_bg,
+   },
+
+   St_file_info = {
+      bg = colors.lightbg,
+      fg = colors.white,
+   },
+
+   St_file_sep = {
+      bg = colors.statusline_bg,
+      fg = colors.lightbg,
+   },
+
+   St_cwd_icon = {
+      fg = colors.black,
+      bg = colors.red,
+   },
+
+   St_cwd_text = {
+      fg = colors.red,
+      bg = colors.lightbg,
+   },
+
+   St_cwd_sep = {
+      fg = colors.red,
+      bg = colors.grey,
+   },
+
+   St_pos_sep = {
+      fg = colors.green,
+      bg = colors.grey,
+   },
+
+   St_pos_icon = {
+      fg = colors.black,
+      bg = colors.green,
+   },
+
+   St_pos_text = {
+      fg = colors.green,
+      bg = colors.lightbg,
+   },
+}