diff --git a/modules/gitui/hm.nix b/modules/gitui/hm.nix
index ec939f5b..1cf6980a 100644
--- a/modules/gitui/hm.nix
+++ b/modules/gitui/hm.nix
@@ -1,44 +1,32 @@
 { config, lib, ... }:
-let
-  inherit (config.lib.stylix) colors;
-
-  mkRgb =
-    color:
-    let
-      r = colors."${color}-rgb-r";
-      g = colors."${color}-rgb-g";
-      b = colors."${color}-rgb-b";
-    in
-    "Rgb(${r}, ${g}, ${b})";
-in
 {
   options.stylix.targets.gitui.enable =
     config.lib.stylix.mkEnableTarget "GitUI" true;
 
   config = lib.mkIf (config.stylix.enable && config.stylix.targets.gitui.enable) {
-    programs.gitui.theme = ''
+    programs.gitui.theme = with config.lib.stylix.colors.withHashtags; ''
       (
-          selected_tab: Some(Reset),
-          command_fg: Some(${mkRgb "base05"}),
-          selection_bg: Some(${mkRgb "base04"}),
-          selection_fg: Some(${mkRgb "base05"}),
-          cmdbar_bg: Some(${mkRgb "base01"}),
-          cmdbar_extra_lines_bg: Some(${mkRgb "base01"}),
-          disabled_fg: Some(${mkRgb "base04"}),
-          diff_line_add: Some(${mkRgb "base0B"}),
-          diff_line_delete: Some(${mkRgb "base08"}),
-          diff_file_added: Some(${mkRgb "base0A"}),
-          diff_file_removed: Some(${mkRgb "base08"}),
-          diff_file_moved: Some(${mkRgb "base0E"}),
-          diff_file_modified: Some(${mkRgb "base09"}),
-          commit_hash: Some(${mkRgb "base07"}),
-          commit_time: Some(${mkRgb "base05"}),
-          commit_author: Some(${mkRgb "base0D"}),
-          danger_fg: Some(${mkRgb "base08"}),
-          push_gauge_bg: Some(${mkRgb "base0D"}),
-          push_gauge_fg: Some(${mkRgb "base00"}),
-          tag_fg: Some(${mkRgb "base06"}),
-          branch_fg: Some(${mkRgb "base0C"})
+          selected_tab: Some("Reset"),
+          command_fg: Some("${base05}"),
+          selection_bg: Some("${base04}"),
+          selection_fg: Some("${base05}"),
+          cmdbar_bg: Some("${base01}"),
+          cmdbar_extra_lines_bg: Some("${base01}"),
+          disabled_fg: Some("${base04}"),
+          diff_line_add: Some("${base0B}"),
+          diff_line_delete: Some("${base08}"),
+          diff_file_added: Some("${base0A}"),
+          diff_file_removed: Some("${base08}"),
+          diff_file_moved: Some("${base0E}"),
+          diff_file_modified: Some("${base09}"),
+          commit_hash: Some("${base07}"),
+          commit_time: Some("${base05}"}),
+          commit_author: Some("${base0D}"),
+          danger_fg: Some("${base08}"),
+          push_gauge_bg: Some("${base0D}"}),
+          push_gauge_fg: Some("${base00}"),
+          tag_fg: Some("${base06}"),
+          branch_fg: Some("${base0C}")
       )
     '';
   };