diff --git a/Common/Theme.qml b/Common/Theme.qml
index e8cf149f..9610d365 100644
--- a/Common/Theme.qml
+++ b/Common/Theme.qml
@@ -535,9 +535,6 @@ Singleton {
             return
         }
 
-        generateNiriConfig()
-        generateGhosttyConfig()
-
         if (gtkThemingEnabled && typeof SettingsData !== "undefined" && SettingsData.gtkThemingEnabled) {
             generateSystemThemes()
         } else if (qtThemingEnabled && typeof SettingsData !== "undefined" && SettingsData.qtThemingEnabled) {
@@ -545,79 +542,7 @@ Singleton {
         }
     }
 
-    function generateNiriConfig() {
-        var dark = matugenColors.colors.dark
-        if (!dark) return
 
-        var bg = dark.background || "#1a1c1e"
-        var primary = dark.primary || "#42a5f5"
-        var secondary = dark.secondary || "#8ab4f8"
-        var inverse = dark.inverse_primary || "#6200ea"
-
-        var content = `layout {
-        border {
-        active-color   "${primary}"
-        inactive-color "${secondary}"
-        }
-        focus-ring {
-        active-color   "${inverse}"
-        }
-        background-color "${bg}"
-        }`
-
-        Quickshell.execDetached(["bash", "-c", `echo '${content}' > niri-colors.generated.kdl`])
-    }
-
-    function generateGhosttyConfig() {
-        var dark = matugenColors.colors.dark
-        var light = matugenColors.colors.light
-        if (!dark || !light) return
-
-        var bg = dark.background || "#1a1c1e"
-        var fg = dark.on_background || "#e3e8ef"
-        var primary = dark.primary || "#42a5f5"
-        var secondary = dark.secondary || "#8ab4f8"
-        var tertiary = dark.tertiary || "#bb86fc"
-        var tertiary_ctr = dark.tertiary_container || "#3700b3"
-        var error = dark.error || "#cf6679"
-        var inverse = dark.inverse_primary || "#6200ea"
-
-        var bg_b = light.background || "#fef7ff"
-        var fg_b = light.on_background || "#1d1b20"
-        var primary_b = light.primary || "#1976d2"
-        var secondary_b = light.secondary || "#1565c0"
-        var tertiary_b = light.tertiary || "#7b1fa2"
-        var tertiary_ctr_b = light.tertiary_container || "#e1bee7"
-        var error_b = light.error || "#b00020"
-        var inverse_b = light.inverse_primary || "#bb86fc"
-
-        var content = `background = ${bg}
-        foreground = ${fg}
-        cursor-color = ${inverse}
-        selection-background = ${secondary}
-        selection-foreground = #ffffff
-        palette = 0=${bg}
-        palette = 1=${error}
-        palette = 2=${tertiary}
-        palette = 3=${secondary}
-        palette = 4=${primary}
-        palette = 5=${tertiary_ctr}
-        palette = 6=${inverse}
-        palette = 7=${fg}
-        palette = 8=${bg_b}
-        palette = 9=${error_b}
-        palette = 10=${tertiary_b}
-        palette = 11=${secondary_b}
-        palette = 12=${primary_b}
-        palette = 13=${tertiary_ctr_b}
-        palette = 14=${inverse_b}
-        palette = 15=${fg_b}`
-
-        var ghosttyConfigDir = configDir + "/ghostty"
-        var ghosttyConfigPath = ghosttyConfigDir + "/config-dankcolors"
-
-        Quickshell.execDetached(["bash", "-c", `mkdir -p '${ghosttyConfigDir}' && echo '${content}' > '${ghosttyConfigPath}'`])
-    }
 
     Component.onCompleted: {
         matugenCheck.running = true
diff --git a/matugen-config.toml b/matugen-config.toml
index bc951381..db9004df 100644
--- a/matugen-config.toml
+++ b/matugen-config.toml
@@ -22,4 +22,12 @@ output_path = '~/.local/share/color-schemes/DankMatugen.colors'
 
 [templates.dgop]
 input_path = './templates/dgop.json'
-output_path = '~/.config/dgop/colors.json'
\ No newline at end of file
+output_path = '~/.config/dgop/colors.json'
+
+[templates.niri]
+input_path = './templates/niri-colors.kdl'
+output_path = '~/.config/niri/dankshell-colors.kdl'
+
+[templates.ghostty]
+input_path = './templates/ghostty-colors.conf'
+output_path = '~/.config/ghostty/config-dankcolors'
\ No newline at end of file
diff --git a/templates/ghostty-colors.conf b/templates/ghostty-colors.conf
new file mode 100644
index 00000000..0b11b93a
--- /dev/null
+++ b/templates/ghostty-colors.conf
@@ -0,0 +1,21 @@
+background = {{colors.background.default.hex}}
+foreground = {{colors.on_background.default.hex}}
+cursor-color = {{colors.inverse_primary.default.hex}}
+selection-background = {{colors.secondary.default.hex}}
+selection-foreground = {{colors.on_secondary.default.hex}}
+palette = 0={{colors.background.default.hex}}
+palette = 1={{colors.error.default.hex}}
+palette = 2={{colors.tertiary.default.hex}}
+palette = 3={{colors.secondary.default.hex}}
+palette = 4={{colors.primary.default.hex}}
+palette = 5={{colors.tertiary_container.default.hex}}
+palette = 6={{colors.inverse_primary.default.hex}}
+palette = 7={{colors.on_background.default.hex}}
+palette = 8={{colors.surface_container.default.hex}}
+palette = 9={{colors.error_container.default.hex}}
+palette = 10={{colors.tertiary_container.default.hex}}
+palette = 11={{colors.secondary_container.default.hex}}
+palette = 12={{colors.primary_container.default.hex}}
+palette = 13={{colors.outline.default.hex}}
+palette = 14={{colors.outline_variant.default.hex}}
+palette = 15={{colors.on_surface.default.hex}}
\ No newline at end of file
diff --git a/templates/niri-colors.kdl b/templates/niri-colors.kdl
new file mode 100644
index 00000000..daef90d0
--- /dev/null
+++ b/templates/niri-colors.kdl
@@ -0,0 +1,10 @@
+layout {
+    border {
+        active-color   "{{colors.primary.default.hex}}"
+        inactive-color "{{colors.secondary.default.hex}}"
+    }
+    focus-ring {
+        active-color   "{{colors.inverse_primary.default.hex}}"
+    }
+    background-color "{{colors.background.default.hex}}"
+}
\ No newline at end of file