diff --git a/bin/omarchy-theme-set-templates b/bin/omarchy-theme-set-templates
index 11b3559c..5d65a633 100755
--- a/bin/omarchy-theme-set-templates
+++ b/bin/omarchy-theme-set-templates
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 TEMPLATES_DIR="$OMARCHY_PATH/default/themed"
+USER_TEMPLATES_DIR="$HOME/.config/omarchy/theme.d"
 NEXT_THEME_DIR="$HOME/.config/omarchy/current/next-theme"
 COLORS_FILE="$NEXT_THEME_DIR/colors.toml"
 
@@ -30,7 +31,9 @@ if [[ -f $COLORS_FILE ]]; then
   done < "$COLORS_FILE"
 
   shopt -s nullglob
-  for tpl in "$TEMPLATES_DIR"/*.tpl; do
+
+  # Process user templates first, then built-in templates (user overrides built-in)
+  for tpl in "$USER_TEMPLATES_DIR"/*.tpl "$TEMPLATES_DIR"/*.tpl; do
     filename=$(basename "$tpl" .tpl)
     output_path="$NEXT_THEME_DIR/$filename"