diff --git a/bin/set-colors b/bin/set-colors
index 2a17259..b56f7be 100755
--- a/bin/set-colors
+++ b/bin/set-colors
@@ -13,8 +13,7 @@ install_dark() {
     ln -sf "${DOTFILES}/bat/config-dark"                 "${DOTFILES}/bat/config"
     ln -sf "${DOTFILES}/vim/colors/jdkaplan-dark.vim"    "${DOTFILES}/vim/colors/jdkaplan.vim"
     ln -sf "${DOTFILES}/neovim/colors/jdkaplan-cool.lua" "${DOTFILES}/neovim/colors/jdkaplan-temp.lua"
-
-    "${DOTFILES}/helix/install" dark
+    ln -sf "${DOTFILES}/helix/themes/dark.toml"          "${DOTFILES}/helix/themes/jdkaplan.toml"
 
     if [ "${OSTYPE}" == 'Linux' ]; then
         ln -sf "${DOTFILES}/xsettingsd/xsettingsd-dark.conf" "${DOTFILES}/xsettingsd/xsettingsd.conf"
@@ -32,8 +31,7 @@ install_light() {
     ln -sf "${DOTFILES}/bat/config-light"                "${DOTFILES}/bat/config"
     ln -sf "${DOTFILES}/vim/colors/jdkaplan-light.vim"   "${DOTFILES}/vim/colors/jdkaplan.vim"
     ln -sf "${DOTFILES}/neovim/colors/jdkaplan-warm.lua" "${DOTFILES}/neovim/colors/jdkaplan-temp.lua"
-
-    "${DOTFILES}/helix/install" light
+    ln -sf "${DOTFILES}/helix/themes/light.toml"         "${DOTFILES}/helix/themes/jdkaplan.toml"
 
     if [ "${OSTYPE}" == 'Linux' ]; then
         ln -sf "${DOTFILES}/xsettingsd/xsettingsd-light.conf" "${DOTFILES}/xsettingsd/xsettingsd.conf"
diff --git a/default.conf.yaml b/default.conf.yaml
index 4a153ef..2f91c35 100644
--- a/default.conf.yaml
+++ b/default.conf.yaml
@@ -4,7 +4,6 @@
     - mkdir -p ~/.config/direnv
     - mkdir -p ~/.config/gh
     - ./bin/set-colors
-    - ./helix/install
 
 - clean: ["~", "~/.config"]
 
diff --git a/helix/.gitignore b/helix/.gitignore
deleted file mode 100644
index 2aa20b5..0000000
--- a/helix/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-config.toml
-theme.toml
diff --git a/helix/main.toml b/helix/config.toml
similarity index 96%
rename from helix/main.toml
rename to helix/config.toml
index 4fd80f3..1de16de 100644
--- a/helix/main.toml
+++ b/helix/config.toml
@@ -1,3 +1,5 @@
+theme = "jdkaplan"
+
 [editor]
 scrolloff = 1
 cursorline = true
diff --git a/helix/dark.toml b/helix/dark.toml
deleted file mode 100644
index 18e93ce..0000000
--- a/helix/dark.toml
+++ /dev/null
@@ -1 +0,0 @@
-theme = "onedark"
diff --git a/helix/install b/helix/install
deleted file mode 100755
index 14c305b..0000000
--- a/helix/install
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-set -exuo pipefail
-
-cd "$(dirname "${BASH_SOURCE[0]}")"
-
-case "${1-}" in
-    light) ln -sf light.toml theme.toml ;;
-    dark)  ln -sf  dark.toml theme.toml ;;
-esac
-
-cat theme.toml main.toml > config.toml
diff --git a/helix/light.toml b/helix/light.toml
deleted file mode 100644
index a9d5ac6..0000000
--- a/helix/light.toml
+++ /dev/null
@@ -1 +0,0 @@
-theme = "onelight"
diff --git a/helix/themes/.gitignore b/helix/themes/.gitignore
new file mode 100644
index 0000000..e119f8a
--- /dev/null
+++ b/helix/themes/.gitignore
@@ -0,0 +1 @@
+jdkaplan.toml
diff --git a/helix/themes/dark.toml b/helix/themes/dark.toml
new file mode 100644
index 0000000..fab7b09
--- /dev/null
+++ b/helix/themes/dark.toml
@@ -0,0 +1,3 @@
+inherits = "onedark"
+
+"comment" = { fg = "light-gray" }
diff --git a/helix/themes/light.toml b/helix/themes/light.toml
new file mode 100644
index 0000000..de41f19
--- /dev/null
+++ b/helix/themes/light.toml
@@ -0,0 +1,7 @@
+inherits = "onelight"
+
+"comment" = { fg = "grey" }
+"comment.line" = { fg = "grey" }
+"comment.line.documentation" = { fg = "grey" }
+"comment.block" = { fg = "grey" }
+"comment.block.documentation" = { fg = "grey" }