diff --git a/helix/themes/base.toml b/helix/themes/base.toml
new file mode 100644
index 0000000..0750ef5
--- /dev/null
+++ b/helix/themes/base.toml
@@ -0,0 +1,233 @@
+## Syntax highlighting
+
+"attribute" = { fg = "Type" }
+
+"type"              = { fg = "Type" }
+# "type.builtin"      = {}
+# "type.parameter"    = {}
+# "type.enum"         = {}
+# "type.enum.variant" = {}
+
+"constructor" = {}
+
+"constant"                  = { fg = "Constant" }
+# "constant.builtin"          = {}
+# "constant.builtin.boolean"  = {}
+# "constant.character"        = {}
+# "constant.character.escape" = {}
+# "constant.numeric"          = {}
+# "constant.numeric.integer"  = {}
+# "constant.numeric.float"    = {}
+
+"string"                = { fg = "String" }
+# "string.regexp"         = {}
+# "string.special"        = {}
+# "string.special.path"   = {}
+# "string.special.url"    = {}
+# "string.special.symbol" = {}
+
+"comment"        = { fg = "Comment" }
+# "comment.line"   = {}
+# "comment.block"  = {}
+# "comment.unused" = {}
+
+# "variable"                      = {}
+# "variable.builtin"              = {}
+# "variable.parameter"            = {}
+# "variable.other"                = {}
+# "variable.other.member"         = {}
+# "variable.other.member.private" = {}
+
+"label" = { fg = "Keyword" }
+
+# "punctuation"           = {}
+# "punctuation.delimiter" = {}
+# "punctuation.bracket"   = {}
+# "punctuation.special"   = {}
+
+"keyword"                      = { fg = "Keyword" }
+# "keyword.control"              = {}
+# "keyword.control.conditional"  = {}
+# "keyword.control.repeat"       = {}
+# "keyword.control.import"       = {}
+# "keyword.control.return"       = {}
+# "keyword.control.exception"    = {}
+# "keyword.operator"             = {}
+# "keyword.directive"            = {}
+# "keyword.function"             = {}
+# "keyword.storage"              = {}
+# "keyword.storage.type"         = {}
+# "keyword.storage.modifier"     = {}
+
+"operator" = { fg = "Keyword" }
+
+"function"                 = { fg = "Function" }
+# "function.builtin"         = {}
+# "function.method"          = {}
+# "function.method.private"  = {}
+"function.macro"           = { fg = "Keyword" }
+# "function.special"         = {}
+
+"tag"         = { fg = "Keyword" }
+# "tag.builtin" = {}
+
+# "namespace" = {}
+
+# "special" = {}
+
+"markup"                 = {}
+"markup.heading"         = { modifiers = ["bold"] }
+# "markup.heading.marker"  = {}
+# "markup.heading.1"       = {}
+# "markup.heading.2"       = {}
+# "markup.heading.3"       = {}
+# "markup.heading.4"       = {}
+# "markup.heading.5"       = {}
+# "markup.heading.6"       = {}
+# "markup.list"            = {}
+# "markup.list.unnumbered" = {}
+# "markup.list.numbered"   = {}
+# "markup.list.checked"    = {}
+# "markup.list.unchecked"  = {}
+"markup.bold"            = { modifiers = ["bold"] }
+"markup.italic"          = { modifiers = ["italic"] }
+"markup.strikethrough"   = { modifiers = ["crossed_out"] }
+"markup.link"            = {}
+"markup.link.url"        = { fg = "String" }
+"markup.link.label"      = { fg = "Constant" }
+"markup.link.text"       = { fg = "Constant" }
+# "markup.quote"           = {}
+# "markup.raw"             = {}
+# "markup.raw.inline"      = {}
+# "markup.raw.block"       = {}
+
+"diff"                 = {}
+"diff.plus"            = { fg = "DiffAdd" }
+"diff.minus"           = { fg = "DiffDelete" }
+"diff.delta"           = { fg = "DiffChange" }
+"diff.delta.moved"     = { fg = "DiffMove" }
+"diff.delta.conflict"  = { modifiers = ["reversed"] }
+# "diff.plus.gutter"     = {}
+# "diff.minus.gutter"    = {}
+# "diff.delta.gutter"    = {}
+
+## Interface inherits some styles from "markup"
+
+# "markup.normal"                = {}
+# "markup.normal.completion"     = {}
+# "markup.normal.hover"          = {}
+# "markup.heading.completion"    = {}
+# "markup.heading.hover"         = {}
+# "markup.raw.inline.completion" = {}
+# "markup.raw.inline.hover"      = {}
+
+"ui.background"           = { bg = "Background" }
+# "ui.background.separator" = {}
+
+"ui.cursor"                = { fg = "Background", bg = "CursorSecondary" }
+"ui.cursor.match"          = { bg = "CursorMatch", modifiers = ["bold"] }
+"ui.cursor.primary"        = { fg = "Background", bg = "CursorPrimary"}
+# "ui.cursor.normal"         = {}
+# "ui.cursor.insert"         = {}
+# "ui.cursor.select"         = {}
+# "ui.cursor.primary.normal" = {}
+# "ui.cursor.primary.insert" = {}
+# "ui.cursor.primary.select" = {}
+
+# "ui.debug.breakpoint" = {}
+# "ui.debug.active"     = {}
+
+"ui.gutter"          = { fg = "TextTertiary" }
+"ui.gutter.selected" = { fg = "TextSecondary", bg = "Focused" }
+
+"ui.linenr"          = { fg = "TextLineNumber" }
+"ui.linenr.selected" = { fg = "TextPrimary", bg = "Focused", modifiers = ["bold"] }
+
+"ui.statusline"           = { bg = "BorderActive" }
+"ui.statusline.inactive"  = { bg = "BorderInactive", fg = "TextSecondary" }
+# "ui.statusline.normal"    = {}
+# "ui.statusline.insert"    = {}
+# "ui.statusline.select"    = {}
+# "ui.statusline.separator" = {}
+
+# "ui.bufferline"            = {}
+# "ui.bufferline.active"     = {}
+# "ui.bufferline.background" = {}
+
+"ui.popup"      = { bg = "Window" }
+# "ui.popup.info" = {}
+
+"ui.picker.header"               = { fg = "TextSecondary" }
+"ui.picker.header.column"        = { fg = "Keyword" }
+"ui.picker.header.column.active" = { fg = "Keyword", underline.style = "line" }
+
+"ui.window" = { fg = "BorderActive" }
+
+"ui.help" = { bg = "Focused" }
+
+"ui.text"           = { fg = "TextPrimary" }
+"ui.text.focus"     = { fg = "TextPrimary", bg = "Focused" }
+"ui.text.inactive"  = { fg = "TextSecondary" }
+# "ui.text.info"      = {
+# "ui.text.directory" = {}
+
+"ui.virtual.ruler"                = { bg = "Ruler" }
+"ui.virtual.whitespace"           = { fg = "Whitespace"}
+"ui.virtual.inlay-hint"           = { fg = "Comment" }
+"ui.virtual.wrap"                 = { fg = "Whitespace" }
+"ui.virtual.jump-label"           = { fg = "JumpLabel", bg = "TextTertiary" }
+# "ui.virtual.indent-guide"         = {}
+# "ui.virtual.inlay-hint.parameter" = {}
+# "ui.virtual.inlay-hint.type"      = {}
+
+"ui.menu"          = { bg = "Focused" }
+"ui.menu.selected" = { bg = "TextSecondary" }
+"ui.menu.scroll"   = { bg = "TextSecondary", fg = "TextTertiary" }
+
+"ui.selection"         = { bg = "Selection", modifiers = ["dim"] }
+"ui.selection.primary" = { bg = "Selection" }
+
+"ui.highlight"           = { bg = "Focused" }
+# "ui.highlight.frameline" = {}
+
+"ui.cursorline.primary"   = { bg = "Focused" }
+"ui.cursorline.secondary" = { bg = "TextTertiary" }
+
+"ui.cursorcolumn.primary"   = { fg = "White", bg = "Focused" }
+"ui.cursorcolumn.secondary" = { fg = "White", bg = "TextTertiary" }
+
+## Gutter
+"warning" = { fg = "Warning" }
+"error"   = { fg = "Error" }
+"info"    = { fg = "Info" }
+"hint"    = { fg = "Hint" }
+
+## Editing area
+"diagnostic"             = { fg = "Comment" }
+"diagnostic.hint"        = { fg = "Hint" }
+"diagnostic.info"        = { fg = "Info" }
+"diagnostic.warning"     = { fg = "Warning" }
+"diagnostic.error"       = { fg = "Error" }
+"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic.deprecated"  = { modifiers = ["crossed_out"] }
+
+"tabstop" = { bg = "TextSecondary", modifiers = ["italic"] }
+
+[palette]
+# default       = ""
+# black         = ""
+# red           = ""
+# green         = ""
+# yellow        = ""
+# blue          = ""
+# magenta       = ""
+# cyan          = ""
+# gray          = ""
+# light-red     = ""
+# light-green   = ""
+# light-yellow  = ""
+# light-blue    = ""
+# light-magenta = ""
+# light-cyan    = ""
+# light-gray    = ""
+# white         = ""
diff --git a/helix/themes/dark.toml b/helix/themes/dark.toml
index f39ec63..e8109a9 100644
--- a/helix/themes/dark.toml
+++ b/helix/themes/dark.toml
@@ -1,6 +1,41 @@
-inherits = "onedark"
+inherits = "base"
 
-"comment" = { fg = "light-gray" }
+[palette]
+Comment    = "#afafaf"
+Constant   = "#af87ff"
+Directory  = "#007cff"
+Function   = "#00d7ff"
+Keyword    = "#5fd75f"
+String     = "#d7af00"
+Type       = "#d7d700"
 
-"ui.background" = { bg = "#222222" }
-"ui.cursorline.primary" = { bg = "#000000" }
+JumpLabel  = "#007cff"
+Ruler      = "#111111"
+Whitespace = "#4e4e4e"
+
+Background = "#1d1f21"
+Focused    = "#000000"
+Window     = "#000000"
+
+TextPrimary    = "#ffffff"
+TextLineNumber = "#a7a7a7"
+TextSecondary  = "#4e4e4e"
+TextTertiary   = "#303030"
+
+DiffAdd    = "#44b342"
+DiffChange = "#2972e0"
+DiffDelete = "#e51029"
+DiffMove   = "#b479f2"
+
+Warning = "#de935f"
+Error   = "#a54242"
+Info    = "#5f819d"
+Hint    = "#777777"
+
+CursorPrimary   = "#ffffff"
+CursorSecondary = "#afafaf"
+CursorMatch     = "#303030"
+Selection       = "#303030"
+
+BorderActive   = "#303030"
+BorderInactive = "#080808"
diff --git a/helix/themes/light.toml b/helix/themes/light.toml
index de41f19..e397ae4 100644
--- a/helix/themes/light.toml
+++ b/helix/themes/light.toml
@@ -1,7 +1,41 @@
-inherits = "onelight"
+inherits = "base"
 
-"comment" = { fg = "grey" }
-"comment.line" = { fg = "grey" }
-"comment.line.documentation" = { fg = "grey" }
-"comment.block" = { fg = "grey" }
-"comment.block.documentation" = { fg = "grey" }
+[palette]
+Comment    = "#666666"
+Constant   = "#876fff"
+Directory  = "#1b15fd"
+Function   = "#d75f00"
+Keyword    = "#880000"
+String     = "#005f00"
+Type       = "#8700d7"
+
+JumpLabel  = "#1b15fd"
+Ruler      = "#eeeeee"
+Whitespace = "#808080"
+
+Background = "#ffffff"
+Focused    = "#eeeeee"
+Window     = "#eeeeee"
+
+TextPrimary    = "#303030"
+TextLineNumber = "#aaaaaa"
+TextSecondary  = "#c6c6c6"
+TextTertiary   = "#e0e0e0"
+
+DiffAdd    = "#44b342"
+DiffChange = "#2972e0"
+DiffDelete = "#e51029"
+DiffMove   = "#b479f2"
+
+Warning = "#f06d14"
+Error   = "#f32840"
+Info    = "#4e85da"
+Hint    = "#015700"
+
+CursorPrimary   = "#000000"
+CursorSecondary = "#666666"
+CursorMatch     = "#e0e0e0"
+Selection       = "#e0e0e0"
+
+BorderActive   = "#e0e0e0"
+BorderInactive = "#f2f2f2"