16 files changed, 10 insertions, 575 deletions
diff --git a/lua/lualine/themes/darkplus.lua b/lua/lualine/themes/darkplus.lua
deleted file mode 100644
index 8e710d1f..00000000
--- a/lua/lualine/themes/darkplus.lua
+++ /dev/null
@@ -1,31 +0,0 @@
-local colors = {
-  blue = "#569cd6",
-  green = "#6a9955",
-  purple = "#c586c0",
-  red = "#d16969",
-  yellow = "#dcdcaa",
-  yellow_orange = "#d7ba7d",
-  orange = "#ce9178",
-  fg = "#b4b4b4",
-  bg = "#252525",
-  gray1 = "#252525",
-  gray2 = "#252525",
-  gray3 = "#252525",
-}
-
-return {
-  normal = {
-    a = { fg = colors.fg, bg = colors.blue, gui = "bold" },
-    b = { fg = colors.fg, bg = colors.bg },
-    c = { fg = colors.fg, bg = colors.bg },
-  },
-  insert = { a = { fg = colors.fg, bg = colors.green, gui = "bold" } },
-  visual = { a = { fg = colors.fg, bg = colors.purple, gui = "bold" } },
-  command = { a = { fg = colors.fg, bg = colors.cyan, gui = "bold" } },
-  replace = { a = { fg = colors.fg, bg = colors.red, gui = "bold" } },
-  inactive = {
-    a = { fg = colors.gray1, bg = colors.bg, gui = "bold" },
-    b = { fg = colors.gray1, bg = colors.bg },
-    c = { fg = colors.gray1, bg = colors.bg },
-  },
-}
diff --git a/lua/lualine/themes/onedarker.lua b/lua/lualine/themes/onedarker.lua
deleted file mode 100644
index 85904eeb..00000000
--- a/lua/lualine/themes/onedarker.lua
+++ /dev/null
@@ -1,35 +0,0 @@
--- Copyright (c) 2020-2021 shadmansaleh
--- MIT license, see LICENSE for more details.
--- Credit: Zoltan Dalmadi(lightline)
--- LuaFormatter off
-local colors = {
-  blue = "#61afef",
-  green = "#98c379",
-  purple = "#c678dd",
-  red1 = "#e06c75",
-  red2 = "#be5046",
-  yellow = "#e5c07b",
-  orange = "#D19A66",
-  fg = "#abb2bf",
-  bg = "#282c34",
-  gray1 = "#5c6370",
-  gray2 = "#2c323d",
-  gray3 = "#3e4452",
-}
--- LuaFormatter on
-return {
-  normal = {
-    a = { fg = colors.gray2, bg = colors.blue, gui = "bold" },
-    b = { fg = colors.fg, bg = colors.bg },
-    c = { fg = colors.fg, bg = colors.bg },
-  },
-  insert = { a = { fg = colors.gray2, bg = colors.green, gui = "bold" } },
-  visual = { a = { fg = colors.gray2, bg = colors.purple, gui = "bold" } },
-  command = { a = { fg = colors.gray2, bg = colors.yellow, gui = "bold" } },
-  replace = { a = { fg = colors.gray2, bg = colors.red1, gui = "bold" } },
-  inactive = {
-    a = { fg = colors.gray1, bg = colors.bg, gui = "bold" },
-    b = { fg = colors.gray1, bg = colors.bg },
-    c = { fg = colors.gray1, bg = colors.bg },
-  },
-}
diff --git a/lua/lvim/plugin-loader.lua b/lua/lvim/plugin-loader.lua
index 0fbe9971..a017b9b1 100644
--- a/lua/lvim/plugin-loader.lua
+++ b/lua/lvim/plugin-loader.lua
@@ -93,10 +93,6 @@ function plugin_loader.load(configurations)
     Log:warn "problems detected while loading plugins' configurations"
     Log:trace(debug.traceback())
   end
-
-  -- Colorscheme must get called after plugins are loaded or it will break new installs.
-  vim.g.colors_name = lvim.colorscheme
-  vim.cmd("colorscheme " .. lvim.colorscheme)
 end
 
 function plugin_loader.get_core_plugins()
diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua
index c7d6963f..489d7097 100644
--- a/lua/lvim/plugins.lua
+++ b/lua/lvim/plugins.lua
@@ -52,13 +52,20 @@ return {
     commit = commit.nvim_lsp_installer,
   },
   {
+    "lunarvim/onedarker.nvim",
+    config = function()
+      require("onedarker").setup()
+    end,
+    disable = lvim.colorscheme ~= "onedarker",
+  },
+  {
     "rcarriga/nvim-notify",
     commit = commit.nvim_notify,
-    disable = not lvim.builtin.notify.active,
     config = function()
       require("lvim.core.notify").setup()
     end,
-    event = "BufRead",
+    requires = { "nvim-telescope/telescope.nvim" },
+    disable = not lvim.builtin.notify.active or not lvim.builtin.telescope.active,
   },
   { "Tastyep/structlog.nvim", commit = commit.structlog },
 
@@ -75,6 +82,7 @@ return {
   },
   {
     "nvim-telescope/telescope-fzf-native.nvim",
+    requires = { "nvim-telescope/telescope.nvim" },
     commit = commit.telescope_fzf_native,
     run = "make",
     disable = not lvim.builtin.telescope.active,
diff --git a/lua/onedarker/Git.lua b/lua/onedarker/Git.lua
deleted file mode 100644
index b47ccf23..00000000
--- a/lua/onedarker/Git.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-local Git = {
-  SignAdd = { fg = C.sign_add },
-  SignChange = { fg = C.sign_change },
-  SignDelete = { fg = C.sign_delete },
-  GitSignsAdd = { fg = C.sign_add },
-  GitSignsChange = { fg = C.sign_change },
-  GitSignsDelete = { fg = C.sign_delete },
-}
-
-return Git
diff --git a/lua/onedarker/LSP.lua b/lua/onedarker/LSP.lua
deleted file mode 100644
index 82b9f799..00000000
--- a/lua/onedarker/LSP.lua
+++ /dev/null
@@ -1,121 +0,0 @@
-local LSP = {
-  LspDiagnosticsDefaultError = { fg = C.error_red },
-  LspDiagnosticsDefaultWarning = { fg = C.warning_orange },
-  LspDiagnosticsDefaultInformation = { fg = C.info_yellow },
-  LspDiagnosticsDefaultHint = { fg = C.hint_blue },
-  LspDiagnosticsVirtualTextError = { fg = C.error_red },
-  LspDiagnosticsVirtualTextWarning = { fg = C.warning_orange },
-  LspDiagnosticsVirtualTextInformation = { fg = C.info_yellow },
-  LspDiagnosticsVirtualTextHint = { fg = C.hint_blue },
-  LspDiagnosticsFloatingError = { fg = C.error_red },
-  LspDiagnosticsFloatingWarning = { fg = C.warning_orange },
-  LspDiagnosticsFloatingInformation = { fg = C.info_yellow },
-  LspDiagnosticsFloatingHint = { fg = C.hint_blue },
-  DiagnosticFloatingError = { fg = C.error_red },
-  DiagnosticFloatingWarn = { fg = C.warning_orange },
-  DiagnosticFloatingInfo = { fg = C.info_yellow },
-  DiagnosticFloatingHint = { fg = C.hint_blue },
-  LspDiagnosticsSignError = { fg = C.error_red },
-  LspDiagnosticsSignWarning = { fg = C.warning_orange },
-  LspDiagnosticsSignInformation = { fg = C.info_yellow },
-  LspDiagnosticsSignHint = { fg = C.hint_blue },
-  DiagnosticSignError = { fg = C.error_red },
-  DiagnosticSignWarn = { fg = C.warning_orange },
-  DiagnosticSignInfo = { fg = C.info_yellow },
-  DiagnosticSignHint = { fg = C.hint_blue },
-  LspDiagnosticsError = { fg = C.error_red },
-  LspDiagnosticsWarning = { fg = C.warning_orange },
-  LspDiagnosticsInformation = { fg = C.info_yellow },
-  LspDiagnosticsHint = { fg = C.hint_blue },
-  LspDiagnosticsUnderlineError = { style = "underline" },
-  LspDiagnosticsUnderlineWarning = { style = "underline" },
-  LspDiagnosticsUnderlineInformation = { style = "underline" },
-  LspDiagnosticsUnderlineHint = { style = "underline" },
-  DiagnosticUnderlineError = { style = "underline" },
-  DiagnosticUnderlineWarn = { style = "underline" },
-  DiagnosticUnderlineInfo = { style = "underline" },
-  DiagnosticUnderlineHint = { style = "underline" },
-  LspReferenceRead = { bg = C.fg_gutter, style = "bold" },
-  LspReferenceText = { bg = C.fg_gutter, style = "bold" },
-  LspReferenceWrite = { bg = C.fg_gutter, style = "bold" },
-  QuickScopePrimary = { fg = C.purple_test, style = "underline" },
-  QuickScopeSecondary = { fg = C.cyan_test, style = "underline" },
-  TelescopeSelection = { fg = C.hint_blue },
-  TelescopeMatching = { fg = C.info_yellow, style = "bold" },
-  TelescopeBorder = { fg = C.cyan, bg = Config.transparent_background and "NONE" or C.bg },
-  TelescopePromptPrefix = { fg = C.purple },
-  NvimTreeFolderIcon = { fg = C.blue },
-  NvimTreeIndentMarker = { fg = C.gray },
-  NvimTreeNormal = { fg = C.light_gray, bg = C.alt_bg },
-  NvimTreeVertSplit = { fg = C.alt_bg, bg = C.alt_bg },
-  NvimTreeFolderName = { fg = C.blue },
-  NvimTreeOpenedFolderName = { fg = C.cyan, style = "italic" },
-  NvimTreeImageFile = { fg = C.purple },
-  NvimTreeSpecialFile = { fg = C.orange },
-  NvimTreeGitStaged = { fg = C.sign_add },
-  NvimTreeCursorLine = { bg = C.bg },
-  NvimTreeGitNew = { fg = C.sign_add },
-  NvimTreeGitDirty = { fg = C.sign_add },
-  NvimTreeGitDeleted = { fg = C.sign_delete },
-  NvimTreeGitMerge = { fg = C.sign_change },
-  NvimTreeGitRenamed = { fg = C.sign_change },
-  NvimTreeSymlink = { fg = C.cyan },
-  NvimTreeRootFolder = { fg = C.fg, style = "bold" },
-  NvimTreeExecFile = { fg = C.green },
-  LirFloatNormal = { fg = C.light_gray, bg = C.alt_bg },
-  LirDir = { fg = C.blue },
-  LirSymLink = { fg = C.cyan },
-  LirEmptyDirText = { fg = C.blue },
-  BufferCurrent = { fg = C.fg, bg = C.bg },
-  BufferCurrentIndex = { fg = C.fg, bg = C.bg },
-  BufferCurrentMod = { fg = C.info_yellow, bg = C.bg },
-  BufferCurrentSign = { fg = C.hint_blue, bg = C.bg },
-  BufferCurrentTarget = { fg = C.red, bg = C.bg, style = "bold" },
-  BufferVisible = { fg = C.fg, bg = C.bg },
-  BufferVisibleIndex = { fg = C.fg, bg = C.bg },
-  BufferVisibleMod = { fg = C.info_yellow, bg = C.bg },
-  BufferVisibleSign = { fg = C.gray, bg = C.bg },
-  BufferVisibleTarget = { fg = C.red, bg = C.bg, style = "bold" },
-  BufferInactive = { fg = C.gray, bg = C.alt_bg },
-  BufferInactiveIndex = { fg = C.gray, bg = C.alt_bg },
-  BufferInactiveMod = { fg = C.info_yellow, bg = C.alt_bg },
-  BufferInactiveSign = { fg = C.gray, bg = C.alt_bg },
-  BufferInactiveTarget = { fg = C.red, bg = C.alt_bg, style = "bold" },
-  StatusLine = { fg = C.alt_bg },
-  StatusLineNC = { fg = C.alt_bg },
-  StatusLineSeparator = { fg = C.alt_bg },
-  StatusLineTerm = { fg = C.alt_bg },
-  StatusLineTermNC = { fg = C.alt_bg },
-  CodiVirtualText = { fg = C.hint_blue },
-  IndentBlanklineContextChar = { fg = C.context },
-  IndentBlanklineChar = { fg = C.dark_gray },
-  IndentBlanklineSpaceChar = { fg = C.cyan_test },
-  IndentBlanklineSpaceCharBlankline = { fg = C.info_yellow },
-  DashboardHeader = { fg = C.blue },
-  DashboardCenter = { fg = C.purple },
-  DashboardFooter = { fg = C.cyan },
-  xmlTag = { fg = C.blue },
-  xmlTagName = { fg = C.blue },
-  xmlEndTag = { fg = C.blue },
-  CompeDocumentation = { bg = C.alt_bg },
-  DiffViewNormal = { fg = C.gray, bg = C.alt_bg },
-  DiffviewStatusAdded = { fg = C.sign_add },
-  DiffviewStatusModified = { fg = C.sign_change },
-  DiffviewStatusRenamed = { fg = C.sign_change },
-  DiffviewStatusDeleted = { fg = C.sign_delete },
-  DiffviewFilePanelInsertion = { fg = C.sign_add },
-  DiffviewFilePanelDeletion = { fg = C.sign_delete },
-  DiffviewVertSplit = { bg = C.bg },
-  diffAdded = { fg = C.sign_add },
-  diffRemoved = { fg = C.sign_delete },
-  diffFileId = { fg = C.blue, style = "bold,reverse" },
-  diffFile = { fg = C.alt_bg },
-  diffNewFile = { fg = C.green },
-  diffOldFile = { fg = C.red },
-  debugPc = { bg = C.cyan },
-  debugBreakpoint = { fg = C.red, style = "reverse" },
-  FocusedSymbol = { fg = C.purple, style = "bold" },
-  SymbolsOutlineConnector = { fg = C.context },
-}
-
-return LSP
diff --git a/lua/onedarker/Notify.lua b/lua/onedarker/Notify.lua
deleted file mode 100644
index 4eebc00e..00000000
--- a/lua/onedarker/Notify.lua
+++ /dev/null
@@ -1,24 +0,0 @@
-local Notify = {
-  NotifyERRORBorder = { fg = C.error_red },
-  NotifyWARNBorder = { fg = C.warning_orange },
-  NotifyINFOBorder = { fg = C.green },
-  NotifyDEBUGBorder = { fg = C.purple_test },
-  NotifyTRACEBorder = { fg = C.purple },
-  NotifyERRORIcon = { fg = C.error_red },
-  NotifyWARNIcon = { fg = C.warning_orange },
-  NotifyINFOIcon = { fg = C.green },
-  NotifyDEBUGIcon = { fg = C.purple_test },
-  NotifyTRACEIcon = { fg = C.purple },
-  NotifyERRORTitle = { fg = C.error_red },
-  NotifyWARNTitle = { fg = C.warning_orange },
-  NotifyINFOTitle = { fg = C.green },
-  NotifyDEBUGTitle = { fg = C.purple_test },
-  NotifyTRACETitle = { fg = C.purple },
-  NotifyERRORBody = { fg = C.fg },
-  NotifyWARNBody = { fg = C.fg },
-  NotifyINFOBody = { fg = C.fg },
-  NotifyDEBUGBody = { fg = C.fg },
-  NotifyTRACEBody = { fg = C.fg },
-}
-
-return Notify
diff --git a/lua/onedarker/Treesitter.lua b/lua/onedarker/Treesitter.lua
deleted file mode 100644
index 0718b852..00000000
--- a/lua/onedarker/Treesitter.lua
+++ /dev/null
@@ -1,66 +0,0 @@
-local Treesitter = {
-  TSComment = { fg = C.gray },
-  TSAnnotation = { fg = C.blue },
-  TSAttribute = { fg = C.cyan },
-  TSConstructor = { fg = C.yellow },
-  TSType = { fg = C.yellow },
-  TSTypeBuiltin = { fg = C.yellow },
-  TSConditional = { fg = C.purple },
-  TSException = { fg = C.purple },
-  TSInclude = { fg = C.purple },
-  TSKeyword = { fg = C.purple },
-  TSKeywordReturn = { fg = C.purple },
-  TSKeywordFunction = { fg = C.purple },
-  TSLabel = { fg = C.blue },
-  TSNone = { fg = C.fg },
-  TSNamespace = { fg = C.purple },
-  TSRepeat = { fg = C.purple },
-  TSConstant = { fg = C.orange },
-  TSConstBuiltin = { fg = C.orange },
-  TSFloat = { fg = C.orange },
-  TSNumber = { fg = C.orange },
-  TSBoolean = { fg = C.orange },
-  TSCharacter = { fg = C.green },
-  TSError = { fg = C.error_red },
-  TSFunction = { fg = C.blue },
-  TSFuncBuiltin = { fg = C.blue },
-  TSMethod = { fg = C.blue },
-  TSConstMacro = { fg = C.cyan },
-  TSFuncMacro = { fg = C.blue },
-  TSProperty = { fg = C.cyan },
-  TSOperator = { fg = C.purple },
-  TSField = { fg = C.blue },
-  TSParameter = { fg = C.red },
-  TSParameterReference = { fg = C.red },
-  TSVariable = { fg = C.fg },
-  TSVariableBuiltin = { fg = C.red },
-  TSSymbol = { fg = C.cyan },
-  TSText = { fg = C.fg },
-  TSTextReference = { fg = C.red },
-  TSPunctDelimiter = { fg = C.fg },
-  TSTagDelimiter = { fg = C.gray },
-  TSTagAttribute = { fg = C.orange },
-  TSPunctBracket = { fg = C.fg },
-  TSPunctSpecial = { fg = C.fg },
-  TSString = { fg = C.green },
-  TSStringRegex = { fg = C.orange },
-  TSStringEscape = { fg = C.orange },
-  TSTag = { fg = C.blue },
-  TSEmphasis = { style = "italic" },
-  TSUnderline = { style = "underline" },
-  TSNote = { fg = C.info_yellow, style = "bold" },
-  TSWarning = { fg = C.warning_orange, style = "bold" },
-  TSDanger = { fg = C.error_red, style = "bold" },
-  TSTitle = { fg = C.blue, style = "bold" },
-  TSLiteral = { fg = C.green },
-  TSURI = { fg = C.blue, style = "underline" },
-  TSMath = { fg = C.fg },
-  TSKeywordOperator = { fg = C.purple },
-  TSStructure = { fg = C.fg },
-  TSStrong = { fg = C.yellow_orange },
-  TSQueryLinterError = { fg = C.warning_orange },
-  TSEnvironment = { fg = C.fg },
-  TSEnvironmentName = { fg = C.fg },
-}
-
-return Treesitter
diff --git a/lua/onedarker/Whichkey.lua b/lua/onedarker/Whichkey.lua
deleted file mode 100644
index 86b42bd6..00000000
--- a/lua/onedarker/Whichkey.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-local Whichkey = {
-  WhichKey = { fg = C.purple },
-  WhichKeySeperator = { fg = C.green },
-  WhichKeyGroup = { fg = C.cyan },
-  WhichKeyDesc = { fg = C.blue },
-  WhichKeyFloat = { bg = C.dark },
-}
-
-return Whichkey
diff --git a/lua/onedarker/config.lua b/lua/onedarker/config.lua
deleted file mode 100644
index ebac7109..00000000
--- a/lua/onedarker/config.lua
+++ /dev/null
@@ -1,23 +0,0 @@
-local config
-
-vim = vim or { g = {}, o = {} }
-
-local function opt(key, default)
-  if vim.g[key] == nil then
-    return default
-  end
-  if vim.g[key] == 0 then
-    return false
-  end
-  return vim.g[key]
-end
-
-config = {
-  transparent_background = opt("transparent_background", false),
-  italic_comments = opt("italic_keywords", true) and "italic" or "NONE",
-  italic_keywords = opt("italic_keywords", true) and "italic" or "NONE",
-  italic_functions = opt("italic_function", false) and "italic" or "NONE",
-  italic_variables = opt("italic_variables", true) and "italic" or "NONE",
-}
-
-return config
diff --git a/lua/onedarker/diff.lua b/lua/onedarker/diff.lua
deleted file mode 100644
index 49463daa..00000000
--- a/lua/onedarker/diff.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-local diff = {
-  DiffAdd = { fg = C.none, bg = C.diff_add },
-  DiffDelete = { fg = C.none, bg = C.diff_delete },
-  DiffChange = { fg = C.none, bg = C.diff_change, style = "bold" },
-  DiffText = { fg = C.none, bg = C.diff_text },
-  DiffAdded = { fg = C.green },
-  DiffRemoved = { fg = C.red },
-  DiffFile = { fg = C.cyan },
-  DiffIndexLine = { fg = C.gray },
-}
-
-return diff
diff --git a/lua/onedarker/highlights.lua b/lua/onedarker/highlights.lua
deleted file mode 100644
index f035635b..00000000
--- a/lua/onedarker/highlights.lua
+++ /dev/null
@@ -1,107 +0,0 @@
-local highlights = {
-  Normal = { fg = C.fg, bg = Config.transparent_background and "NONE" or C.bg },
-  SignColumn = { bg = C.bg },
-  MsgArea = { fg = C.fg, bg = Config.transparent_background and "NONE" or C.bg },
-  ModeMsg = { fg = C.fg, bg = C.bg },
-  MsgSeparator = { fg = C.fg, bg = C.bg },
-  SpellBad = { fg = C.error_red, style = "underline" },
-  SpellCap = { fg = C.yellow, style = "underline" },
-  SpellLocal = { fg = C.green, style = "underline" },
-  SpellRare = { fg = C.purple, style = "underline" },
-  NormalNC = { fg = C.fg, bg = Config.transparent_background and "NONE" or C.bg },
-  Pmenu = { fg = C.light_gray, bg = C.popup_back },
-  PmenuSel = { fg = C.alt_bg, bg = C.blue },
-  WildMenu = { fg = C.alt_bg, bg = C.blue },
-  CursorLineNr = { fg = C.light_gray, style = "bold" },
-  Comment = { fg = C.gray, style = "italic" },
-  Folded = { fg = C.accent, bg = C.alt_bg },
-  FoldColumn = { fg = C.accent, bg = C.alt_bg },
-  LineNr = { fg = C.context },
-  FloatBorder = { fg = C.gray, bg = C.alt_bg },
-  Whitespace = { fg = C.gray },
-  VertSplit = { fg = C.bg, bg = C.fg },
-  CursorLine = { bg = C.dark },
-  CursorColumn = { bg = C.dark },
-  ColorColumn = { bg = C.dark },
-  NormalFloat = { bg = C.dark },
-  Visual = { bg = C.ui_blue },
-  VisualNOS = { bg = C.alt_bg },
-  WarningMsg = { fg = C.error_red, bg = C.bg },
-  DiffAdd = { fg = C.alt_bg, bg = C.sign_add },
-  DiffChange = { fg = C.alt_bg, bg = C.sign_change, style = "underline" },
-  DiffDelete = { fg = C.alt_bg, bg = C.sign_delete },
-  QuickFixLine = { bg = C.dark_gray },
-  PmenuSbar = { bg = C.alt_bg },
-  PmenuThumb = { bg = C.gray },
-  MatchWord = { style = "underline" },
-  MatchParen = { fg = C.hint_blue, bg = C.bg, style = "underline" },
-  MatchWordCur = { style = "underline" },
-  MatchParenCur = { style = "underline" },
-  Cursor = { fg = C.cursor_fg, bg = C.cursor_bg },
-  lCursor = { fg = C.cursor_fg, bg = C.cursor_bg },
-  CursorIM = { fg = C.cursor_fg, bg = C.cursor_bg },
-  TermCursor = { fg = C.cursor_fg, bg = C.cursor_bg },
-  TermCursorNC = { fg = C.cursor_fg, bg = C.cursor_bg },
-  Conceal = { fg = C.accent, bg = Config.transparent_background and "NONE" or C.bg },
-  Directory = { fg = C.blue },
-  SpecialKey = { fg = C.blue, style = "bold" },
-  Title = { fg = C.blue, style = "bold" },
-  ErrorMsg = { fg = C.error_red, bg = C.bg, style = "bold" },
-  Search = { fg = C.light_gray, bg = C.search_blue },
-  IncSearch = { fg = C.light_gray, bg = C.search_blue },
-  Substitute = { fg = C.light_gray, bg = C.search_orange },
-  MoreMsg = { fg = C.orange },
-  Question = { fg = C.orange },
-  EndOfBuffer = { fg = C.bg },
-  NonText = { fg = C.context },
-  Variable = { fg = C.cyan },
-  String = { fg = C.green },
-  Character = { fg = C.green },
-  Constant = { fg = C.orange },
-  Number = { fg = C.orange },
-  Boolean = { fg = C.orange },
-  Float = { fg = C.orange },
-  Identifier = { fg = C.fg },
-  Function = { fg = C.blue },
-  Operator = { fg = C.purple },
-  Type = { fg = C.yellow },
-  StorageClass = { fg = C.cyan },
-  Structure = { fg = C.purple },
-  Typedef = { fg = C.purple },
-  Keyword = { fg = C.purple },
-  Statement = { fg = C.purple },
-  Conditional = { fg = C.purple },
-  Repeat = { fg = C.purple },
-  Label = { fg = C.blue },
-  Exception = { fg = C.purple },
-  Include = { fg = C.purple },
-  PreProc = { fg = C.purple },
-  Define = { fg = C.purple },
-  Macro = { fg = C.purple },
-  PreCondit = { fg = C.purple },
-  Special = { fg = C.purple },
-  SpecialChar = { fg = C.fg },
-  Tag = { fg = C.blue },
-  Debug = { fg = C.red },
-  Delimiter = { fg = C.fg },
-  SpecialComment = { fg = C.gray },
-  Underlined = { style = "underline" },
-  Bold = { style = "bold" },
-  Italic = { style = "italic" },
-  Ignore = { fg = C.cyan, bg = C.bg, style = "bold" },
-  Todo = { fg = C.red, bg = C.bg, style = "bold" },
-  Error = { fg = C.error_red, bg = C.bg, style = "bold" },
-  TabLine = { fg = C.light_gray, bg = C.alt_bg },
-  TabLineSel = { fg = C.fg, bg = C.alt_bg },
-  TabLineFill = { fg = C.fg, bg = C.alt_bg },
-  CmpDocumentation = { fg = C.fg, bg = C.none },
-  CmpDocumentationBorder = { fg = C.fg_dark, bg = C.none },
-  CmpItemAbbr = { fg = C.fg, bg = C.none },
-  CmpItemAbbrDeprecated = { fg = C.gray, bg = C.none },
-  CmpItemAbbrMatch = { fg = C.cyan, bg = C.none },
-  CmpItemAbbrMatchFuzzy = { fg = C.cyan, bg = C.none },
-  CmpItemKind = { fg = C.blue, bg = C.none },
-  CmpItemMenu = { fg = C.light_gray, bg = C.none },
-}
-
-return highlights
diff --git a/lua/onedarker/init.lua b/lua/onedarker/init.lua
deleted file mode 100644
index dec56afa..00000000
--- a/lua/onedarker/init.lua
+++ /dev/null
@@ -1,34 +0,0 @@
-vim.api.nvim_command "hi clear"
-if vim.fn.exists "syntax_on" then
-  vim.api.nvim_command "syntax reset"
-end
-vim.o.background = "dark"
-vim.o.termguicolors = true
-vim.g.colors_name = "onedarker"
-
-local util = require "onedarker.util"
-Config = require "onedarker.config"
-C = require "onedarker.palette"
-local highlights = require "onedarker.highlights"
-local Treesitter = require "onedarker.Treesitter"
-local markdown = require "onedarker.markdown"
-local Whichkey = require "onedarker.Whichkey"
-local Notify = require "onedarker.Notify"
-local Git = require "onedarker.Git"
-local LSP = require "onedarker.LSP"
-local diff = require "onedarker.diff"
-
-local skeletons = {
-  highlights,
-  Treesitter,
-  markdown,
-  Whichkey,
-  Notify,
-  Git,
-  LSP,
-  diff,
-}
-
-for _, skeleton in ipairs(skeletons) do
-  util.initialise(skeleton)
-end
diff --git a/lua/onedarker/markdown.lua b/lua/onedarker/markdown.lua
deleted file mode 100644
index d3a5d485..00000000
--- a/lua/onedarker/markdown.lua
+++ /dev/null
@@ -1,27 +0,0 @@
-local markdown = {
-  markdownBlockquote = { fg = C.accent },
-  markdownBold = { fg = C.yellow, style = "bold" },
-  markdownCode = { fg = C.green },
-  markdownCodeBlock = { fg = C.green },
-  markdownCodeDelimiter = { fg = C.green },
-  markdownH1 = { fg = C.blue },
-  markdownH2 = { fg = C.blue },
-  markdownH3 = { fg = C.blue },
-  markdownH4 = { fg = C.blue },
-  markdownH5 = { fg = C.blue },
-  markdownH6 = { fg = C.blue },
-  markdownHeadingDelimiter = { fg = C.blue },
-  markdownHeadingRule = { fg = C.accent },
-  markdownId = { fg = C.purple },
-  markdownIdDeclaration = { fg = C.blue },
-  markdownIdDelimiter = { fg = C.light_gray },
-  markdownLinkDelimiter = { fg = C.light_gray },
-  markdownItalic = { style = "italic" },
-  markdownLinkText = { fg = C.blue },
-  markdownListMarker = { fg = C.red },
-  markdownOrderedListMarker = { fg = C.red },
-  markdownRule = { fg = C.accent },
-  markdownUrl = { fg = C.cyan, style = "underline" },
-}
-
-return markdown
diff --git a/lua/onedarker/palette.lua b/lua/onedarker/palette.lua
deleted file mode 100644
index 81ea3af3..00000000
--- a/lua/onedarker/palette.lua
+++ /dev/null
@@ -1,45 +0,0 @@
-local colors = {
-  none = "NONE",
-  fg = "#abb2bf",
-  bg = "#1f2227",
-  alt_bg = "#282c34",
-  dark = "#282c34",
-  accent = "#BBBBBB",
-  dark_gray = "#2a2f3e",
-  fg_gutter = "#353d46",
-  context = "#4b5263",
-  popup_back = "#282c34",
-  search_orange = "#613214",
-  search_blue = "#5e81ac",
-  gray = "#5c6370",
-  light_gray = "#abb2bf",
-  blue = "#61AFEF",
-  dark_blue = "#223E55",
-  green = "#98C379",
-  cyan = "#56B6C2",
-  red = "#e06c75",
-  orange = "#D19A66",
-  light_red = "#be5046",
-  yellow = "#E5C07B",
-  yellow_orange = "#D7BA7D",
-  purple = "#C678DD",
-  magenta = "#D16D9E",
-  cursor_fg = "#515052",
-  cursor_bg = "#AEAFAD",
-  sign_add = "#587c0c",
-  sign_change = "#0c7d9d",
-  sign_delete = "#94151b",
-  error_red = "#F44747",
-  warning_orange = "#ff8800",
-  info_yellow = "#FFCC66",
-  hint_blue = "#4FC1FF",
-  purple_test = "#ff007c",
-  cyan_test = "#00dfff",
-  ui_blue = "#264F78",
-  diff_add = "#303d27",
-  diff_delete = "#6e3b40",
-  diff_change = "#18344c",
-  diff_text = "#265478",
-}
-
-return colors
diff --git a/lua/onedarker/util.lua b/lua/onedarker/util.lua
deleted file mode 100644
index dbac18a2..00000000
--- a/lua/onedarker/util.lua
+++ /dev/null
@@ -1,25 +0,0 @@
-local M = {}
-
-local function highlight(group, properties)
-  local bg = properties.bg == nil and "" or "guibg=" .. properties.bg
-  local fg = properties.fg == nil and "" or "guifg=" .. properties.fg
-  local style = properties.style == nil and "" or "gui=" .. properties.style
-
-  local cmd = table.concat({
-    "highlight",
-    group,
-    bg,
-    fg,
-    style,
-  }, " ")
-
-  vim.api.nvim_command(cmd)
-end
-
-function M.initialise(skeleton)
-  for group, properties in pairs(skeleton) do
-    highlight(group, properties)
-  end
-end
-
-return M