diff --git a/bin/omarchy-theme-set-templates b/bin/omarchy-theme-set-templates
index e3e0455e..9119d9a5 100755
--- a/bin/omarchy-theme-set-templates
+++ b/bin/omarchy-theme-set-templates
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-TEMPLATES_DIR="$OMARCHY_PATH/themes/templates.d"
+TEMPLATES_DIR="$OMARCHY_PATH/default/themed"
 NEXT_THEME_DIR="$HOME/.config/omarchy/current/next-theme"
 COLORS_FILE="$NEXT_THEME_DIR/colors.toml"
 
diff --git a/themes/templates.d/alacritty.toml.tpl b/default/themed/alacritty.toml.tpl
similarity index 100%
rename from themes/templates.d/alacritty.toml.tpl
rename to default/themed/alacritty.toml.tpl
diff --git a/themes/templates.d/btop.theme.tpl b/default/themed/btop.theme.tpl
similarity index 100%
rename from themes/templates.d/btop.theme.tpl
rename to default/themed/btop.theme.tpl
diff --git a/themes/templates.d/ghostty.conf.tpl b/default/themed/ghostty.conf.tpl
similarity index 100%
rename from themes/templates.d/ghostty.conf.tpl
rename to default/themed/ghostty.conf.tpl
diff --git a/themes/templates.d/hyprland-preview-share-picker.css.tpl b/default/themed/hyprland-preview-share-picker.css.tpl
similarity index 100%
rename from themes/templates.d/hyprland-preview-share-picker.css.tpl
rename to default/themed/hyprland-preview-share-picker.css.tpl
diff --git a/themes/templates.d/hyprland.conf.tpl b/default/themed/hyprland.conf.tpl
similarity index 100%
rename from themes/templates.d/hyprland.conf.tpl
rename to default/themed/hyprland.conf.tpl
diff --git a/themes/templates.d/hyprlock.conf.tpl b/default/themed/hyprlock.conf.tpl
similarity index 100%
rename from themes/templates.d/hyprlock.conf.tpl
rename to default/themed/hyprlock.conf.tpl
diff --git a/themes/templates.d/kitty.conf.tpl b/default/themed/kitty.conf.tpl
similarity index 100%
rename from themes/templates.d/kitty.conf.tpl
rename to default/themed/kitty.conf.tpl
diff --git a/themes/templates.d/mako.ini.tpl b/default/themed/mako.ini.tpl
similarity index 100%
rename from themes/templates.d/mako.ini.tpl
rename to default/themed/mako.ini.tpl
diff --git a/themes/templates.d/opencode.json.tpl b/default/themed/opencode.json.tpl
similarity index 100%
rename from themes/templates.d/opencode.json.tpl
rename to default/themed/opencode.json.tpl
diff --git a/themes/templates.d/swayosd.css.tpl b/default/themed/swayosd.css.tpl
similarity index 100%
rename from themes/templates.d/swayosd.css.tpl
rename to default/themed/swayosd.css.tpl
diff --git a/themes/templates.d/walker.css.tpl b/default/themed/walker.css.tpl
similarity index 100%
rename from themes/templates.d/walker.css.tpl
rename to default/themed/walker.css.tpl
diff --git a/themes/templates.d/waybar.css.tpl b/default/themed/waybar.css.tpl
similarity index 100%
rename from themes/templates.d/waybar.css.tpl
rename to default/themed/waybar.css.tpl