diff --git a/bin/omarchy-menu b/bin/omarchy-menu
index 40e9d37e..d50c61e4 100755
--- a/bin/omarchy-menu
+++ b/bin/omarchy-menu
@@ -303,7 +303,7 @@ show_install_gaming_menu() {
 show_install_style_menu() {
   case $(menu "Install" "󰸌  Theme\n  Background\n  Font") in
   *Theme*) present_terminal omarchy-theme-install ;;
-  *Background*) nautilus ~/.config/omarchy/current/theme/backgrounds ;;
+  *Background*) omarchy-theme-bg-install ;;
   *Font*) show_install_font_menu ;;
   *) show_install_menu ;;
   esac
diff --git a/bin/omarchy-theme-bg-install b/bin/omarchy-theme-bg-install
new file mode 100755
index 00000000..2ba2cb8b
--- /dev/null
+++ b/bin/omarchy-theme-bg-install
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+CURRENT_THEME_NAME=$(cat "$HOME/.config/omarchy/current/theme.name")
+THEME_USER_BACKGROUNDS="$HOME/.config/omarchy/backgrounds/$CURRENT_THEME_NAME"
+
+mkdir -p "$THEME_USER_BACKGROUNDS"
+nautilus "$THEME_USER_BACKGROUNDS"
diff --git a/bin/omarchy-theme-bg-next b/bin/omarchy-theme-bg-next
index 52c1355e..e073db5c 100755
--- a/bin/omarchy-theme-bg-next
+++ b/bin/omarchy-theme-bg-next
@@ -2,10 +2,12 @@
 
 # Cycles through the background images available
 
-BACKGROUNDS_DIR="$HOME/.config/omarchy/current/theme/backgrounds/"
+THEME_NAME=$(cat "$HOME/.config/omarchy/current/theme.name" 2>/dev/null)
+THEME_BACKGROUNDS_PATH="$HOME/.config/omarchy/current/theme/backgrounds/"
+USER_BACKGROUNDS_PATH="$HOME/.config/omarchy/backgrounds/$THEME_NAME/"
 CURRENT_BACKGROUND_LINK="$HOME/.config/omarchy/current/background"
 
-mapfile -d '' -t BACKGROUNDS < <(find -L "$BACKGROUNDS_DIR" -type f -print0 | sort -z)
+mapfile -d '' -t BACKGROUNDS < <(find -L "$USER_BACKGROUNDS_PATH" "$THEME_BACKGROUNDS_PATH" -maxdepth 1 -type f -print0 2>/dev/null | sort -z)
 TOTAL=${#BACKGROUNDS[@]}
 
 if [[ $TOTAL -eq 0 ]]; then
diff --git a/bin/omarchy-theme-current b/bin/omarchy-theme-current
index 40350c53..fc2dab31 100755
--- a/bin/omarchy-theme-current
+++ b/bin/omarchy-theme-current
@@ -1,3 +1,9 @@
 #!/bin/bash
 
-basename "$(realpath "$HOME/.config/omarchy/current/theme")" | sed -E 's/(^|-)([a-z])/\1\u\2/g; s/-/ /g'
+THEME_NAME_PATH="$HOME/.config/omarchy/current/theme.name"
+
+if [[ -f $THEME_NAME_PATH ]]; then
+  cat $THEME_NAME_PATH | sed -E 's/(^|-)([a-z])/\1\u\2/g; s/-/ /g'
+else
+  echo "Unknown"
+fi
diff --git a/bin/omarchy-theme-list b/bin/omarchy-theme-list
index 944979f4..08678288 100755
--- a/bin/omarchy-theme-list
+++ b/bin/omarchy-theme-list
@@ -1,5 +1,8 @@
 #!/bin/bash
 
-find ~/.config/omarchy/themes/ -mindepth 1 -maxdepth 1 \( -type d -o -type l \) | sort | while read -r path; do
-  echo "$(basename "$path" | sed -E 's/(^|-)([a-z])/\1\u\2/g; s/-/ /g')"
+{
+  find ~/.config/omarchy/themes/ -mindepth 1 -maxdepth 1 \( -type d -o -type l \) -printf '%f\n'
+  find "$OMARCHY_PATH/themes/" -mindepth 1 -maxdepth 1 -type d -printf '%f\n'
+} | sort -u | while read -r name; do
+  echo "$name" | sed -E 's/(^|-)([a-z])/\1\u\2/g; s/-/ /g'
 done
diff --git a/bin/omarchy-theme-next b/bin/omarchy-theme-next
deleted file mode 100755
index eb97d907..00000000
--- a/bin/omarchy-theme-next
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-THEMES_DIR="$HOME/.config/omarchy/themes/"
-CURRENT_THEME_LINK="$HOME/.config/omarchy/current/theme"
-
-THEMES=($(find "$THEMES_DIR" -mindepth 1 -maxdepth 1 | sort))
-TOTAL=${#THEMES[@]}
-
-# Get current theme from symlink
-if [[ -L "$CURRENT_THEME_LINK" ]]; then
-  CURRENT_THEME=$(realpath "$CURRENT_THEME_LINK")
-else
-  # Default to first theme if no symlink exists
-  CURRENT_THEME=$(realpath "${THEMES[0]}")
-fi
-
-# Find current theme index
-INDEX=0
-for i in "${!THEMES[@]}"; do
-  THEMES[$i]=$(realpath "${THEMES[$i]}")
-
-  if [[ "${THEMES[$i]}" == "$CURRENT_THEME" ]]; then
-    INDEX=$i
-    break
-  fi
-done
-
-# Get next theme (wrap around)
-NEXT_INDEX=$(((INDEX + 1) % TOTAL))
-NEW_THEME=${THEMES[$NEXT_INDEX]}
-NEW_THEME_NAME=$(basename "$NEW_THEME")
-
-omarchy-theme-set $NEW_THEME_NAME
-notify-send "Theme changed to $NEW_THEME_NAME" -t 2000
diff --git a/bin/omarchy-theme-remove b/bin/omarchy-theme-remove
index 21959454..ee51d809 100755
--- a/bin/omarchy-theme-remove
+++ b/bin/omarchy-theme-remove
@@ -31,10 +31,5 @@ if [ ! -d "$THEME_PATH" ]; then
   exit 1
 fi
 
-# Move to the next theme if the current theme is the one being removed
-if [ "$(readlink -f "$CURRENT_DIR/theme")" = "$(readlink -f "$THEME_PATH")" ]; then
-  omarchy-theme-next
-fi
-
 # Now remove the theme directory for THEME_NAME
 rm -rf "$THEME_PATH"
diff --git a/bin/omarchy-theme-set b/bin/omarchy-theme-set
index 9a4b0fee..1aa8082b 100755
--- a/bin/omarchy-theme-set
+++ b/bin/omarchy-theme-set
@@ -1,24 +1,42 @@
 #!/bin/bash
 
-if [[ -z $1 && $1 != "CNCLD" ]]; then
+if [[ -z $1 ]]; then
   echo "Usage: omarchy-theme-set <theme-name>"
   exit 1
 fi
 
-THEMES_DIR="$HOME/.config/omarchy/themes/"
-CURRENT_THEME_DIR="$HOME/.config/omarchy/current/theme"
+CURRENT_THEME_PATH="$HOME/.config/omarchy/current/theme"
+NEXT_THEME_PATH="$HOME/.config/omarchy/current/next-theme"
+USER_THEMES_PATH="$HOME/.config/omarchy/themes"
+OMARCHY_THEMES_PATH="$OMARCHY_PATH/themes"
 
 THEME_NAME=$(echo "$1" | sed -E 's/<[^>]+>//g' | tr '[:upper:]' '[:lower:]' | tr ' ' '-')
-THEME_PATH="$THEMES_DIR/$THEME_NAME"
 
-# Check if the theme entered exists
-if [[ ! -d "$THEME_PATH" ]]; then
-  echo "Theme '$THEME_NAME' does not exist in $THEMES_DIR"
+if [[ -d "$USER_THEMES_PATH/$THEME_NAME" ]]; then
+  THEME_PATH="$USER_THEMES_PATH/$THEME_NAME"
+elif [[ -d "$OMARCHY_THEMES_PATH/$THEME_NAME" ]]; then
+  THEME_PATH="$OMARCHY_THEMES_PATH/$THEME_NAME"
+else
+  echo "Theme '$THEME_NAME' does not exist"
   exit 1
 fi
 
-# Update theme symlinks
-ln -nsf "$THEME_PATH" "$CURRENT_THEME_DIR"
+# Setup clean next theme directory (for atomic theme config swapping)
+rm -rf "$NEXT_THEME_PATH"
+mkdir -p "$NEXT_THEME_PATH"
+
+# Copy static configs
+cp -r "$THEME_PATH/"* "$NEXT_THEME_PATH/" 2>/dev/null
+
+# Generate dynamic configs
+omarchy-theme-set-templates
+
+# Swap next theme in as current
+rm -rf "$CURRENT_THEME_PATH"
+mv "$NEXT_THEME_PATH" "$CURRENT_THEME_PATH"
+
+# Store theme name for reference
+echo "$THEME_NAME" > "$HOME/.config/omarchy/current/theme.name"
 
 # Change background with theme
 omarchy-theme-bg-next
@@ -31,9 +49,10 @@ omarchy-restart-swayosd
 omarchy-restart-terminal
 hyprctl reload
 pkill -SIGUSR2 btop
+# pkill -SIGUSR2 opencode
 makoctl reload
 
-# Change gnome, browser, vscode, cursor themes
+# Change app-specific themes
 omarchy-theme-set-gnome
 omarchy-theme-set-browser
 omarchy-theme-set-vscode
diff --git a/bin/omarchy-theme-set-templates b/bin/omarchy-theme-set-templates
new file mode 100755
index 00000000..11b3559c
--- /dev/null
+++ b/bin/omarchy-theme-set-templates
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+TEMPLATES_DIR="$OMARCHY_PATH/default/themed"
+NEXT_THEME_DIR="$HOME/.config/omarchy/current/next-theme"
+COLORS_FILE="$NEXT_THEME_DIR/colors.toml"
+
+# Convert hex color to decimal RGB (e.g., "#1e1e2e" -> "30,30,46")
+hex_to_rgb() {
+  local hex="${1#\#}"
+  printf "%d,%d,%d" "0x${hex:0:2}" "0x${hex:2:2}" "0x${hex:4:2}"
+}
+
+# Only generate dynamic templates for themes with a colors.toml definition
+if [[ -f $COLORS_FILE ]]; then
+  # Parse TOML using yq (treating it as YAML since the flat key=value structure is compatible)
+  # We convert 'key = value' to 'key: value' to make it valid YAML, then use yq/jq to generate the replacement commands.
+  sed_script=$(mktemp)
+
+  # Generate standard and _strip substitutions
+  sed 's/=/:/' "$COLORS_FILE" | yq -r 'to_entries[] | "s|{{ \(.key) }}|\(.value)|g", "s|{{ \(.key)_strip }}|\(.value | sub("^#";""))|g"' > "$sed_script"
+
+  # Generate _rgb substitutions for hex colors
+  while IFS='=' read -r key value; do
+    key=$(echo "$key" | xargs)
+    value=$(echo "$value" | xargs | tr -d '"')
+    if [[ $value =~ ^# ]]; then
+      rgb=$(hex_to_rgb "$value")
+      echo "s|{{ ${key}_rgb }}|${rgb}|g" >> "$sed_script"
+    fi
+  done < "$COLORS_FILE"
+
+  shopt -s nullglob
+  for tpl in "$TEMPLATES_DIR"/*.tpl; do
+    filename=$(basename "$tpl" .tpl)
+    output_path="$NEXT_THEME_DIR/$filename"
+
+    # Don't overwrite configs already exists in the output directory (copied from theme specific folder)
+    if [[ ! -f $output_path ]]; then
+      sed -f "$sed_script" "$tpl" > "$output_path"
+    fi
+  done
+
+  rm "$sed_script"
+fi
diff --git a/default/elephant/omarchy_themes.lua b/default/elephant/omarchy_themes.lua
index 1f21d847..02baa0a9 100644
--- a/default/elephant/omarchy_themes.lua
+++ b/default/elephant/omarchy_themes.lua
@@ -4,67 +4,93 @@
 Name = "omarchythemes"
 NamePretty = "Omarchy Themes"
 
+-- Check if file exists using Lua (no subprocess)
+local function file_exists(path)
+  local f = io.open(path, "r")
+  if f then
+    f:close()
+    return true
+  end
+  return false
+end
+
+-- Get first matching file from directory using ls (single call for fallback)
+local function first_image_in_dir(dir)
+  local handle = io.popen("ls -1 '" .. dir .. "' 2>/dev/null | head -n 1")
+  if handle then
+    local file = handle:read("*l")
+    handle:close()
+    if file and file ~= "" then
+      return dir .. "/" .. file
+    end
+  end
+  return nil
+end
+
 -- The main function elephant will call
 function GetEntries()
   local entries = {}
-  local theme_dir = os.getenv("HOME") .. "/.config/omarchy/themes"
+  local user_theme_dir = os.getenv("HOME") .. "/.config/omarchy/themes"
+  local omarchy_path = os.getenv("OMARCHY_PATH") or ""
+  local default_theme_dir = omarchy_path .. "/themes"
 
-  -- First, get all theme directories
-  local find_dirs_cmd = "find -L '" .. theme_dir .. "' -mindepth 1 -maxdepth 1 -type d 2>/dev/null"
+  local seen_themes = {}
 
-  local handle = io.popen(find_dirs_cmd)
-  if not handle then
-    return entries
-  end
+  -- Helper function to process themes from a directory
+  local function process_themes_from_dir(theme_dir)
+    -- Single find call to get all theme directories
+    local handle = io.popen("find -L '" .. theme_dir .. "' -mindepth 1 -maxdepth 1 -type d 2>/dev/null")
+    if not handle then
+      return
+    end
 
-  for theme_path in handle:lines() do
-    local theme_name = theme_path:match(".*/(.+)$")
+    for theme_path in handle:lines() do
+      local theme_name = theme_path:match(".*/(.+)$")
 
-    if theme_name then
-      -- find preview image
-      local find_preview_cmd = "find -L '"
-        .. theme_path
-        .. "' -maxdepth 1 -type f \\( -name 'preview.png' -o -name 'preview.jpg' \\) 2>/dev/null | head -n 1"
-      local preview_handle = io.popen(find_preview_cmd)
-      local preview_path = nil
+      if theme_name and not seen_themes[theme_name] then
+        seen_themes[theme_name] = true
 
-      if preview_handle then
-        preview_path = preview_handle:read("*l")
-        preview_handle:close()
-      end
+        -- Check for preview images directly (no subprocess)
+        local preview_path = nil
+        local preview_png = theme_path .. "/preview.png"
+        local preview_jpg = theme_path .. "/preview.jpg"
 
-      -- If no preview found, use first image from backgrounds folder
-      if not preview_path or preview_path == "" then
-        local bg_cmd = "find -L '"
-          .. theme_path
-          .. "/backgrounds' -maxdepth 1 -type f \\( -iname '*.png' -o -iname '*.jpg' -o -iname '*.jpeg' \\) 2>/dev/null | head -n 1"
-        local bg_handle = io.popen(bg_cmd)
-        if bg_handle then
-          preview_path = bg_handle:read("*l")
-          bg_handle:close()
+        if file_exists(preview_png) then
+          preview_path = preview_png
+        elseif file_exists(preview_jpg) then
+          preview_path = preview_jpg
+        else
+          -- Fallback: get first image from backgrounds (one ls call)
+          preview_path = first_image_in_dir(theme_path .. "/backgrounds")
+        end
+
+        if preview_path and preview_path ~= "" then
+          local display_name = theme_name:gsub("_", " "):gsub("%-", " ")
+          display_name = display_name:gsub("(%a)([%w_']*)", function(first, rest)
+            return first:upper() .. rest:lower()
+          end)
+          display_name = display_name .. "  "
+
+          table.insert(entries, {
+            Text = display_name,
+            Preview = preview_path,
+            PreviewType = "file",
+            Actions = {
+              activate = "omarchy-theme-set " .. theme_name,
+            },
+          })
         end
       end
-
-      if preview_path and preview_path ~= "" then
-        local display_name = theme_name:gsub("_", " "):gsub("%-", " ")
-        display_name = display_name:gsub("(%a)([%w_']*)", function(first, rest)
-          return first:upper() .. rest:lower()
-        end)
-        display_name = display_name .. "  "
-
-        table.insert(entries, {
-          Text = display_name,
-          Preview = preview_path,
-          PreviewType = "file",
-          Actions = {
-            activate = "omarchy-theme-set " .. theme_name,
-          },
-        })
-      end
     end
+
+    handle:close()
   end
 
-  handle:close()
+  -- Process user themes first (they take precedence)
+  process_themes_from_dir(user_theme_dir)
+  -- Then process default themes (only if not already seen)
+  process_themes_from_dir(default_theme_dir)
+
   return entries
 end
 
diff --git a/default/themed/alacritty.toml.tpl b/default/themed/alacritty.toml.tpl
new file mode 100644
index 00000000..ff8bc8df
--- /dev/null
+++ b/default/themed/alacritty.toml.tpl
@@ -0,0 +1,47 @@
+[colors.primary]
+background = "{{ background }}"
+foreground = "{{ foreground }}"
+
+[colors.cursor]
+text = "{{ background }}"
+cursor = "{{ cursor }}"
+
+[colors.vi_mode_cursor]
+text = "{{ background }}"
+cursor = "{{ cursor }}"
+
+[colors.search.matches]
+foreground = "{{ background }}"
+background = "{{ color3 }}"
+
+[colors.search.focused_match]
+foreground = "{{ background }}"
+background = "{{ color1 }}"
+
+[colors.footer_bar]
+foreground = "{{ background }}"
+background = "{{ foreground }}"
+
+[colors.selection]
+text = "{{ selection_foreground }}"
+background = "{{ selection_background }}"
+
+[colors.normal]
+black = "{{ color0 }}"
+red = "{{ color1 }}"
+green = "{{ color2 }}"
+yellow = "{{ color3 }}"
+blue = "{{ color4 }}"
+magenta = "{{ color5 }}"
+cyan = "{{ color6 }}"
+white = "{{ color7 }}"
+
+[colors.bright]
+black = "{{ color8 }}"
+red = "{{ color9 }}"
+green = "{{ color10 }}"
+yellow = "{{ color11 }}"
+blue = "{{ color12 }}"
+magenta = "{{ color13 }}"
+cyan = "{{ color14 }}"
+white = "{{ color15 }}"
diff --git a/default/themed/btop.theme.tpl b/default/themed/btop.theme.tpl
new file mode 100644
index 00000000..7b1b299d
--- /dev/null
+++ b/default/themed/btop.theme.tpl
@@ -0,0 +1,83 @@
+# Main background, empty for terminal default, need to be empty if you want transparent background
+theme[main_bg]="{{ background }}"
+
+# Main text color
+theme[main_fg]="{{ foreground }}"
+
+# Title color for boxes
+theme[title]="{{ foreground }}"
+
+# Highlight color for keyboard shortcuts
+theme[hi_fg]="{{ accent }}"
+
+# Background color of selected item in processes box
+theme[selected_bg]="{{ color8 }}"
+
+# Foreground color of selected item in processes box
+theme[selected_fg]="{{ accent }}"
+
+# Color of inactive/disabled text
+theme[inactive_fg]="{{ color8 }}"
+
+# Color of text appearing on top of graphs, i.e uptime and current network graph scaling
+theme[graph_text]="{{ foreground }}"
+
+# Background color of the percentage meters
+theme[meter_bg]="{{ color8 }}"
+
+# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
+theme[proc_misc]="{{ foreground }}"
+
+# CPU, Memory, Network, Proc box outline colors
+theme[cpu_box]="{{ color5 }}"
+theme[mem_box]="{{ color2 }}"
+theme[net_box]="{{ color1 }}"
+theme[proc_box]="{{ accent }}"
+
+# Box divider line and small boxes line color
+theme[div_line]="{{ color8 }}"
+
+# Temperature graph color (Green -> Yellow -> Red)
+theme[temp_start]="{{ color2 }}"
+theme[temp_mid]="{{ color3 }}"
+theme[temp_end]="{{ color1 }}"
+
+# CPU graph colors (Teal -> Lavender)
+theme[cpu_start]="{{ color6 }}"
+theme[cpu_mid]="{{ color4 }}"
+theme[cpu_end]="{{ color5 }}"
+
+# Mem/Disk free meter (Mauve -> Lavender -> Blue)
+theme[free_start]="{{ color5 }}"
+theme[free_mid]="{{ color4 }}"
+theme[free_end]="{{ color6 }}"
+
+# Mem/Disk cached meter (Sapphire -> Lavender)
+theme[cached_start]="{{ color4 }}"
+theme[cached_mid]="{{ color6 }}"
+theme[cached_end]="{{ color5 }}"
+
+# Mem/Disk available meter (Peach -> Red)
+theme[available_start]="{{ color3 }}"
+theme[available_mid]="{{ color1 }}"
+theme[available_end]="{{ color1 }}"
+
+# Mem/Disk used meter (Green -> Sky)
+theme[used_start]="{{ color2 }}"
+theme[used_mid]="{{ color6 }}"
+theme[used_end]="{{ color4 }}"
+
+# Download graph colors (Peach -> Red)
+theme[download_start]="{{ color3 }}"
+theme[download_mid]="{{ color1 }}"
+theme[download_end]="{{ color1 }}"
+
+# Upload graph colors (Green -> Sky)
+theme[upload_start]="{{ color2 }}"
+theme[upload_mid]="{{ color6 }}"
+theme[upload_end]="{{ color4 }}"
+
+# Process box color gradient for threads, mem and cpu usage (Sapphire -> Mauve)
+theme[process_start]="{{ color6 }}"
+theme[process_mid]="{{ color4 }}"
+theme[process_end]="{{ color5 }}"
diff --git a/default/themed/ghostty.conf.tpl b/default/themed/ghostty.conf.tpl
new file mode 100644
index 00000000..bafc6498
--- /dev/null
+++ b/default/themed/ghostty.conf.tpl
@@ -0,0 +1,22 @@
+background = {{ background }}
+foreground = {{ foreground }}
+cursor-color = {{ cursor }}
+selection-background = {{ selection_background }}
+selection-foreground = {{ selection_foreground }}
+
+palette = 0={{ color0 }}
+palette = 1={{ color1 }}
+palette = 2={{ color2 }}
+palette = 3={{ color3 }}
+palette = 4={{ color4 }}
+palette = 5={{ color5 }}
+palette = 6={{ color6 }}
+palette = 7={{ color7 }}
+palette = 8={{ color8 }}
+palette = 9={{ color9 }}
+palette = 10={{ color10 }}
+palette = 11={{ color11 }}
+palette = 12={{ color12 }}
+palette = 13={{ color13 }}
+palette = 14={{ color14 }}
+palette = 15={{ color15 }}
diff --git a/themes/ethereal/hyprland-preview-share-picker.css b/default/themed/hyprland-preview-share-picker.css.tpl
similarity index 81%
rename from themes/ethereal/hyprland-preview-share-picker.css
rename to default/themed/hyprland-preview-share-picker.css.tpl
index 55e556e5..07e5e4e8 100644
--- a/themes/ethereal/hyprland-preview-share-picker.css
+++ b/default/themed/hyprland-preview-share-picker.css.tpl
@@ -1,12 +1,12 @@
-@define-color foreground #ffcead;
-@define-color background #060B1E;
-@define-color accent #7d82d9;
-@define-color muted #6d7db6;
-@define-color card_bg #12172b;
-@define-color text_dark #060B1E;
-@define-color accent_hover #c2c4f0;
-@define-color selected_tab #7d82d9;
-@define-color text #ffcead;
+@define-color foreground {{ foreground }};
+@define-color background {{ background }};
+@define-color accent {{ accent }};
+@define-color muted {{ color8 }};
+@define-color card_bg {{ color0 }};
+@define-color text_dark {{ background }};
+@define-color accent_hover {{ color12 }};
+@define-color selected_tab {{ accent }};
+@define-color text {{ foreground }};
 
 * {
   all: unset;
diff --git a/themes/catppuccin-latte/hyprland.conf b/default/themed/hyprland.conf.tpl
similarity index 70%
rename from themes/catppuccin-latte/hyprland.conf
rename to default/themed/hyprland.conf.tpl
index 4a72d792..e4dbf3c3 100644
--- a/themes/catppuccin-latte/hyprland.conf
+++ b/default/themed/hyprland.conf.tpl
@@ -1,4 +1,4 @@
-$activeBorderColor = rgb(1e66f5)
+$activeBorderColor = rgb({{ accent_strip }})
 
 general {
     col.active_border = $activeBorderColor
diff --git a/default/themed/hyprlock.conf.tpl b/default/themed/hyprlock.conf.tpl
new file mode 100644
index 00000000..1b4cac3c
--- /dev/null
+++ b/default/themed/hyprlock.conf.tpl
@@ -0,0 +1,5 @@
+$color = rgba({{ background_rgb }}, 1.0)
+$inner_color = rgba({{ background_rgb }}, 0.8)
+$outer_color = rgba({{ foreground_rgb }}, 1.0)
+$font_color = rgba({{ foreground_rgb }}, 1.0)
+$check_color = rgba({{ accent_rgb }}, 1.0)
diff --git a/default/themed/kitty.conf.tpl b/default/themed/kitty.conf.tpl
new file mode 100644
index 00000000..88006243
--- /dev/null
+++ b/default/themed/kitty.conf.tpl
@@ -0,0 +1,27 @@
+foreground {{ foreground }}
+background {{ background }}
+selection_foreground {{ selection_foreground }}
+selection_background {{ selection_background }}
+
+cursor {{ cursor }}
+cursor_text_color {{ background }}
+
+active_border_color {{ active_border_color }}
+active_tab_background {{ active_tab_background }}
+
+color0 {{ color0 }}
+color1 {{ color1 }}
+color2 {{ color2 }}
+color3 {{ color3 }}
+color4 {{ color4 }}
+color5 {{ color5 }}
+color6 {{ color6 }}
+color7 {{ color7 }}
+color8 {{ color8 }}
+color9 {{ color9 }}
+color10 {{ color10 }}
+color11 {{ color11 }}
+color12 {{ color12 }}
+color13 {{ color13 }}
+color14 {{ color14 }}
+color15 {{ color15 }}
diff --git a/default/themed/mako.ini.tpl b/default/themed/mako.ini.tpl
new file mode 100644
index 00000000..51e9c66f
--- /dev/null
+++ b/default/themed/mako.ini.tpl
@@ -0,0 +1,5 @@
+include=~/.local/share/omarchy/default/mako/core.ini
+
+text-color={{ foreground }}
+border-color={{ foreground }}
+background-color={{ background }}
diff --git a/default/themed/swayosd.css.tpl b/default/themed/swayosd.css.tpl
new file mode 100644
index 00000000..3f609e17
--- /dev/null
+++ b/default/themed/swayosd.css.tpl
@@ -0,0 +1,5 @@
+@define-color background-color {{ background }};
+@define-color border-color {{ foreground }};
+@define-color label {{ foreground }};
+@define-color image {{ foreground }};
+@define-color progress {{ foreground }};
diff --git a/default/themed/walker.css.tpl b/default/themed/walker.css.tpl
new file mode 100644
index 00000000..123ca92c
--- /dev/null
+++ b/default/themed/walker.css.tpl
@@ -0,0 +1,6 @@
+@define-color selected-text {{ accent }};
+@define-color text {{ foreground }};
+@define-color base {{ background }};
+@define-color border {{ foreground }};
+@define-color foreground {{ foreground }};
+@define-color background {{ background }};
diff --git a/default/themed/waybar.css.tpl b/default/themed/waybar.css.tpl
new file mode 100644
index 00000000..d876a922
--- /dev/null
+++ b/default/themed/waybar.css.tpl
@@ -0,0 +1,2 @@
+@define-color foreground {{ foreground }};
+@define-color background {{ background }};
diff --git a/install/omarchy-base.packages b/install/omarchy-base.packages
index d91ed9ad..7373e0f1 100644
--- a/install/omarchy-base.packages
+++ b/install/omarchy-base.packages
@@ -144,4 +144,5 @@ xmlstarlet
 xournalpp
 yaru-icon-theme
 yay
+yq
 zoxide
diff --git a/migrations/1767306902.sh b/migrations/1767306902.sh
new file mode 100644
index 00000000..9a0a1bb1
--- /dev/null
+++ b/migrations/1767306902.sh
@@ -0,0 +1,62 @@
+echo "Migrate to new theme setup"
+
+omarchy-pkg-add yq
+
+# Move user-added backgrounds from Omarchy theme folders to user config
+OMARCHY_DIR="$HOME/.local/share/omarchy"
+USER_BACKGROUNDS_DIR="$HOME/.config/omarchy/backgrounds"
+
+if [[ -d "$OMARCHY_DIR/themes" ]]; then
+  cd "$OMARCHY_DIR"
+
+  # Get list of git-tracked background files (relative to omarchy dir)
+  mapfile -t TRACKED_BACKGROUNDS < <(git ls-files --cached 'themes/*/backgrounds/*' 2>/dev/null)
+
+  # Find all background files and check if they're untracked (user-added)
+  for theme_dir in themes/*/; do
+    theme_name=$(basename "$theme_dir")
+    backgrounds_dir="themes/$theme_name/backgrounds"
+
+    [[ -d "$backgrounds_dir" ]] || continue
+
+    for bg_file in "$backgrounds_dir"/*; do
+      [[ -f "$bg_file" ]] || continue
+
+      # Check if this file is tracked by git
+      is_tracked=false
+      for tracked in "${TRACKED_BACKGROUNDS[@]}"; do
+        if [[ "$tracked" == "$bg_file" ]]; then
+          is_tracked=true
+          break
+        fi
+      done
+
+      if [[ "$is_tracked" == "false" ]]; then
+        # This is a user-added background, move it to user config
+        user_theme_bg_dir="$USER_BACKGROUNDS_DIR/$theme_name"
+        mkdir -p "$user_theme_bg_dir"
+        mv "$bg_file" "$user_theme_bg_dir/"
+        echo "Moved user background: $bg_file -> $user_theme_bg_dir/"
+      fi
+    done
+  done
+fi
+
+THEMES_DIR="$HOME/.config/omarchy/themes"
+CURRENT_THEME_LINK="$HOME/.config/omarchy/current/theme"
+
+# Get current theme name from symlink before removing anything
+CURRENT_THEME_NAME=""
+if [[ -L $CURRENT_THEME_LINK ]]; then
+  CURRENT_THEME_NAME=$(basename "$(readlink "$CURRENT_THEME_LINK")")
+elif [[ -f "$HOME/.config/omarchy/current/theme.name" ]]; then
+  CURRENT_THEME_NAME=$(cat "$HOME/.config/omarchy/current/theme.name")
+fi
+
+# Remove all symlinks from ~/.config/omarchy/themes
+find "$THEMES_DIR" -mindepth 1 -maxdepth 1 -type l -delete
+
+# Re-apply the current theme with the new system
+if [[ -n $CURRENT_THEME_NAME ]]; then
+  omarchy-theme-set "$CURRENT_THEME_NAME"
+fi
diff --git a/themes/catppuccin-latte/alacritty.toml b/themes/catppuccin-latte/alacritty.toml
deleted file mode 100644
index 3fcf61eb..00000000
--- a/themes/catppuccin-latte/alacritty.toml
+++ /dev/null
@@ -1,67 +0,0 @@
-# https://raw.githubusercontent.com/catppuccin/alacritty/main/catppuccin-latte.toml
-
-[colors.primary]
-background = "#eff1f5"
-foreground = "#4c4f69"
-dim_foreground = "#8c8fa1"
-bright_foreground = "#4c4f69"
-
-[colors.cursor]
-text = "#eff1f5"
-cursor = "#dc8a78"
-
-[colors.vi_mode_cursor]
-text = "#eff1f5"
-cursor = "#7287fd"
-
-[colors.search.matches]
-foreground = "#eff1f5"
-background = "#6c6f85"
-
-[colors.search.focused_match]
-foreground = "#eff1f5"
-background = "#40a02b"
-
-[colors.footer_bar]
-foreground = "#eff1f5"
-background = "#6c6f85"
-
-[colors.hints.start]
-foreground = "#eff1f5"
-background = "#df8e1d"
-
-[colors.hints.end]
-foreground = "#eff1f5"
-background = "#6c6f85"
-
-[colors.selection]
-text = "#eff1f5"
-background = "#dc8a78"
-
-[colors.normal]
-black = "#bcc0cc"
-red = "#d20f39"
-green = "#40a02b"
-yellow = "#df8e1d"
-blue = "#1e66f5"
-magenta = "#ea76cb"
-cyan = "#179299"
-white = "#5c5f77"
-
-[colors.bright]
-black = "#acb0be"
-red = "#d20f39"
-green = "#40a02b"
-yellow = "#df8e1d"
-blue = "#1e66f5"
-magenta = "#ea76cb"
-cyan = "#179299"
-white = "#6c6f85"
-
-[[colors.indexed_colors]]
-index = 16
-color = "#fe640b"
-
-[[colors.indexed_colors]]
-index = 17
-color = "#dc8a78"
diff --git a/themes/catppuccin-latte/colors.toml b/themes/catppuccin-latte/colors.toml
new file mode 100644
index 00000000..93e550d6
--- /dev/null
+++ b/themes/catppuccin-latte/colors.toml
@@ -0,0 +1,26 @@
+accent = "#1e66f5"
+active_border_color = "#8839EF"
+active_tab_background = "#8839EF"
+
+cursor = "#dc8a78"
+foreground = "#4c4f69"
+background = "#eff1f5"
+selection_foreground = "#eff1f5"
+selection_background = "#dc8a78"
+
+color0 = "#bcc0cc"
+color1 = "#d20f39"
+color2 = "#40a02b"
+color3 = "#df8e1d"
+color4 = "#1e66f5"
+color5 = "#ea76cb"
+color6 = "#179299"
+color7 = "#5c5f77"
+color8 = "#acb0be"
+color9 = "#d20f39"
+color10 = "#40a02b"
+color11 = "#df8e1d"
+color12 = "#1e66f5"
+color13 = "#ea76cb"
+color14 = "#179299"
+color15 = "#6c6f85"
diff --git a/themes/catppuccin-latte/ghostty.conf b/themes/catppuccin-latte/ghostty.conf
deleted file mode 100644
index e56f4ea6..00000000
--- a/themes/catppuccin-latte/ghostty.conf
+++ /dev/null
@@ -1 +0,0 @@
-theme = Catppuccin Latte
diff --git a/themes/catppuccin-latte/hyprland-preview-share-picker.css b/themes/catppuccin-latte/hyprland-preview-share-picker.css
deleted file mode 100644
index dc534965..00000000
--- a/themes/catppuccin-latte/hyprland-preview-share-picker.css
+++ /dev/null
@@ -1,94 +0,0 @@
-@define-color foreground #4C4F69;
-@define-color background #EFF1F5;
-@define-color accent #1E66F5;
-@define-color muted #9CA0B0;
-@define-color card_bg #E6E9EF;
-@define-color text_dark #EFF1F5;
-@define-color accent_hover #7287FD;
-@define-color selected_tab #1E66F5;
-@define-color text #4C4F69;
-
-* {
-  all: unset;
-  font-family: JetBrains Mono NF;
-  color: @foreground;
-  font-weight: bold;
-  font-size: 16px;
-}
-
-.window {
-  background: alpha(@background, 0.95);
-  border: solid 2px @accent;
-  margin: 4px;
-  padding: 18px;
-}
-
-tabs {
-    padding: 0.5rem 1rem;
-}
-
-tabs > tab {
-    margin-right: 1rem;
-}
-
-.tab-label {
-    color: @text;
-    transition: all 0.2s ease;
-}
-
-tabs > tab:checked > .tab-label, tabs > tab:active > .tab-label {
-    text-decoration: underline currentColor;
-    color: @selected_tab;
-}
-
-tabs > tab:focus > .tab-label {
-    color: @foreground;
-}
-
-.page {
-    padding: 1rem;
-}
-
-.image-label {
-    font-size: 12px;
-    padding: 0.25rem;
-}
-
-flowboxchild > .card, button > .card {
-    transition: all 0.2s ease;
-    border: solid 2px transparent;
-    border-color: @background;
-    border-radius: 5px;
-    background-color: @card_bg;
-    padding: 5px;
-}
-
-flowboxchild:hover > .card, button:hover > .card, flowboxchild:active > .card, flowboxchild:selected > .card, button:active > .card, button:selected > .card, button:focus > .card {
-    border: solid 2px @accent;
-}
-
-.image {
-    border-radius: 5px;
-}
-
-.region-button {
-    padding: 0.5rem 1rem;
-    border-radius: 5px;
-    background-color: @accent;
-    color: @text_dark;
-    transition: all 0.2s ease;
-}
-
-.region-button > label {
-    color: @text_dark;
-}
-
-.region-button:not(:disabled):hover, .region-button:not(:disabled):focus {
-    background-color: @accent_hover;
-    color: @text_dark;
-}
-
-.region-button:disabled {
-    background-color: @muted;
-    color: @background;
-}
diff --git a/themes/catppuccin-latte/hyprlock.conf b/themes/catppuccin-latte/hyprlock.conf
deleted file mode 100644
index c47e5186..00000000
--- a/themes/catppuccin-latte/hyprlock.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-$color = rgba(239,241,245,1.0)
-$inner_color = rgba(239,241,245,0.8)
-$outer_color = rgba(30,102,245,1.0)
-$font_color = rgba(76,79,105,1.0)
-$check_color = rgba(4,165,229,1.0)
-
diff --git a/themes/catppuccin-latte/kitty.conf b/themes/catppuccin-latte/kitty.conf
deleted file mode 100644
index 43cba927..00000000
--- a/themes/catppuccin-latte/kitty.conf
+++ /dev/null
@@ -1,78 +0,0 @@
-## name:     Catppuccin Latte 🐑
-## author:   Pocco81 (https://github.com/Pocco81)
-## license:  MIT
-## upstream: https://github.com/catppuccin/kitty/blob/main/latte.conf
-## blurb:    Soothing pastel theme for the high-spirited!
-
-
-
-# The basic colors
-foreground              #4C4F69
-background              #EFF1F5
-selection_foreground    #EFF1F5
-selection_background    #DC8A78
-
-# Cursor colors
-cursor                  #DC8A78
-cursor_text_color       #EFF1F5
-
-# URL underline color when hovering with mouse
-url_color               #7287FD
-
-# Kitty window border colors
-active_border_color     #8839EF
-inactive_border_color   #7C7F93
-bell_border_color       #E64553
-
-# OS Window titlebar colors
-wayland_titlebar_color system
-macos_titlebar_color system
-
-# Tab bar colors
-active_tab_foreground   #EFF1F5
-active_tab_background   #8839EF
-inactive_tab_foreground #4C4F69
-inactive_tab_background #9CA0B0
-tab_bar_background      #BCC0CC
-
-# Colors for marks (marked text in the terminal)
-mark1_foreground #EFF1F5
-mark1_background #1E66F5
-mark2_foreground #EFF1F5
-mark2_background #8839EF
-mark3_foreground #EFF1F5
-mark3_background #209FB5
-
-# The 16 terminal colors
-
-# black
-color0 #4C4F69
-color8 #6C6F85
-
-# red
-color1 #D20F39
-color9 #D20F39
-
-# green
-color2  #40A02B
-color10 #40A02B
-
-# yellow
-color3  #DF8E1D
-color11 #DF8E1D
-
-# blue
-color4  #1E66F5
-color12 #1E66F5
-
-# magenta
-color5  #EA76CB
-color13 #EA76CB
-
-# cyan
-color6  #179299
-color14 #179299
-
-# white
-color7  #ACB0BE
-color15 #ACB0BE
diff --git a/themes/catppuccin-latte/mako.ini b/themes/catppuccin-latte/mako.ini
deleted file mode 100644
index fa46cfff..00000000
--- a/themes/catppuccin-latte/mako.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-include=~/.local/share/omarchy/default/mako/core.ini
-
-text-color=#4c4f69
-border-color=#1e66f5
-background-color=#eff1f5
diff --git a/themes/catppuccin-latte/swayosd.css b/themes/catppuccin-latte/swayosd.css
deleted file mode 100644
index c5f23aa1..00000000
--- a/themes/catppuccin-latte/swayosd.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@define-color background-color #eff1f5;
-@define-color border-color #1e66f5;
-@define-color label #4c4f69;
-@define-color image #4c4f69;
-@define-color progress #4c4f69;
diff --git a/themes/catppuccin-latte/walker.css b/themes/catppuccin-latte/walker.css
deleted file mode 100644
index 30e54bd1..00000000
--- a/themes/catppuccin-latte/walker.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@define-color selected-text #1e66f5;
-@define-color text #4c4f69;
-@define-color base #eff1f5;
-@define-color border #dce0e8;
-@define-color foreground #4c4f69;
-@define-color background #eff1f5;
diff --git a/themes/catppuccin-latte/waybar.css b/themes/catppuccin-latte/waybar.css
deleted file mode 100644
index 5918ec62..00000000
--- a/themes/catppuccin-latte/waybar.css
+++ /dev/null
@@ -1,4 +0,0 @@
-@define-color foreground #4c4f69; /* text */
-@define-color background #eff1f5; /* base */
-@define-color border     #dce0e8; /* crust */
-@define-color accent     #1e66f5; /* blue */
diff --git a/themes/catppuccin/alacritty.toml b/themes/catppuccin/alacritty.toml
deleted file mode 100644
index 7762dcdb..00000000
--- a/themes/catppuccin/alacritty.toml
+++ /dev/null
@@ -1,65 +0,0 @@
-[colors.primary]
-background = "#1e1e2e"
-foreground = "#cdd6f4"
-dim_foreground = "#7f849c"
-bright_foreground = "#cdd6f4"
-
-[colors.cursor]
-text = "#1e1e2e"
-cursor = "#f5e0dc"
-
-[colors.vi_mode_cursor]
-text = "#1e1e2e"
-cursor = "#b4befe"
-
-[colors.search.matches]
-foreground = "#1e1e2e"
-background = "#a6adc8"
-
-[colors.search.focused_match]
-foreground = "#1e1e2e"
-background = "#a6e3a1"
-
-[colors.footer_bar]
-foreground = "#1e1e2e"
-background = "#a6adc8"
-
-[colors.hints.start]
-foreground = "#1e1e2e"
-background = "#f9e2af"
-
-[colors.hints.end]
-foreground = "#1e1e2e"
-background = "#a6adc8"
-
-[colors.selection]
-text = "#1e1e2e"
-background = "#f5e0dc"
-
-[colors.normal]
-black = "#45475a"
-red = "#f38ba8"
-green = "#a6e3a1"
-yellow = "#f9e2af"
-blue = "#89b4fa"
-magenta = "#f5c2e7"
-cyan = "#94e2d5"
-white = "#bac2de"
-
-[colors.bright]
-black = "#585b70"
-red = "#f38ba8"
-green = "#a6e3a1"
-yellow = "#f9e2af"
-blue = "#89b4fa"
-magenta = "#f5c2e7"
-cyan = "#94e2d5"
-white = "#a6adc8"
-
-[[colors.indexed_colors]]
-index = 16
-color = "#fab387"
-
-[[colors.indexed_colors]]
-index = 17
-color = "#f5e0dc"
diff --git a/themes/catppuccin/colors.toml b/themes/catppuccin/colors.toml
new file mode 100644
index 00000000..30eef198
--- /dev/null
+++ b/themes/catppuccin/colors.toml
@@ -0,0 +1,26 @@
+accent = "#89b4fa"
+active_border_color = "#CBA6F7"
+active_tab_background = "#CBA6F7"
+
+cursor = "#f5e0dc"
+foreground = "#cdd6f4"
+background = "#1e1e2e"
+selection_foreground = "#1e1e2e"
+selection_background = "#f5e0dc"
+
+color0 = "#45475a"
+color1 = "#f38ba8"
+color2 = "#a6e3a1"
+color3 = "#f9e2af"
+color4 = "#89b4fa"
+color5 = "#f5c2e7"
+color6 = "#94e2d5"
+color7 = "#bac2de"
+color8 = "#585b70"
+color9 = "#f38ba8"
+color10 = "#a6e3a1"
+color11 = "#f9e2af"
+color12 = "#89b4fa"
+color13 = "#f5c2e7"
+color14 = "#94e2d5"
+color15 = "#a6adc8"
diff --git a/themes/catppuccin/ghostty.conf b/themes/catppuccin/ghostty.conf
deleted file mode 100644
index fe0502bc..00000000
--- a/themes/catppuccin/ghostty.conf
+++ /dev/null
@@ -1 +0,0 @@
-theme = Catppuccin Mocha
diff --git a/themes/catppuccin/hyprland-preview-share-picker.css b/themes/catppuccin/hyprland-preview-share-picker.css
deleted file mode 100644
index 8fb9f9d2..00000000
--- a/themes/catppuccin/hyprland-preview-share-picker.css
+++ /dev/null
@@ -1,94 +0,0 @@
-@define-color foreground #CDD6F4;
-@define-color background #1E1E2E;
-@define-color accent #87B0F9;
-@define-color muted #43465A;
-@define-color card_bg #181825;
-@define-color text_dark #11111B;
-@define-color accent_hover #B4BEFE;
-@define-color selected_tab #87B0F9;
-@define-color text #CDD6F4;
-
-* {
-  all: unset;
-  font-family: JetBrains Mono NF;
-  color: @foreground;
-  font-weight: bold;
-  font-size: 16px;
-}
-
-.window {
-  background: alpha(@background, 0.95);
-  border: solid 2px @accent;
-  margin: 4px;
-  padding: 18px;
-}
-
-tabs {
-    padding: 0.5rem 1rem;
-}
-
-tabs > tab {
-    margin-right: 1rem;
-}
-
-.tab-label {
-    color: @text;
-    transition: all 0.2s ease;
-}
-
-tabs > tab:checked > .tab-label, tabs > tab:active > .tab-label {
-    text-decoration: underline currentColor;
-    color: @selected_tab;
-}
-
-tabs > tab:focus > .tab-label {
-    color: @foreground;
-}
-
-.page {
-    padding: 1rem;
-}
-
-.image-label {
-    font-size: 12px;
-    padding: 0.25rem;
-}
-
-flowboxchild > .card, button > .card {
-    transition: all 0.2s ease;
-    border: solid 2px transparent;
-    border-color: @background;
-    border-radius: 5px;
-    background-color: @card_bg;
-    padding: 5px;
-}
-
-flowboxchild:hover > .card, button:hover > .card, flowboxchild:active > .card, flowboxchild:selected > .card, button:active > .card, button:selected > .card, button:focus > .card {
-    border: solid 2px @accent;
-}
-
-.image {
-    border-radius: 5px;
-}
-
-.region-button {
-    padding: 0.5rem 1rem;
-    border-radius: 5px;
-    background-color: @accent;
-    color: @text_dark;
-    transition: all 0.2s ease;
-}
-
-.region-button > label {
-    color: @text_dark;
-}
-
-.region-button:not(:disabled):hover, .region-button:not(:disabled):focus {
-    background-color: @accent_hover;
-    color: @text_dark;
-}
-
-.region-button:disabled {
-    background-color: @muted;
-    color: @background;
-}
diff --git a/themes/catppuccin/hyprland.conf b/themes/catppuccin/hyprland.conf
deleted file mode 100644
index da3374ba..00000000
--- a/themes/catppuccin/hyprland.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-$activeBorderColor = rgb(c6d0f5)
-
-general {
-    col.active_border = $activeBorderColor
-}
-
-group {
-    col.border_active = $activeBorderColor
-}
diff --git a/themes/catppuccin/hyprlock.conf b/themes/catppuccin/hyprlock.conf
deleted file mode 100644
index 4bd905b6..00000000
--- a/themes/catppuccin/hyprlock.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-$color = rgba(24,24,36,1.0)
-$inner_color = rgba(24,24,36,0.8)
-$outer_color = rgba(205,214,244,1.0)
-$font_color = rgba(205,214,244,1.0)
-$check_color = rgba(68, 157, 171, 1.0)
diff --git a/themes/catppuccin/kitty.conf b/themes/catppuccin/kitty.conf
deleted file mode 100644
index e8ee9a1a..00000000
--- a/themes/catppuccin/kitty.conf
+++ /dev/null
@@ -1,78 +0,0 @@
-## name:     Catppuccin Mocha 🌿
-## author:   Pocco81 (https://github.com/Pocco81)
-## license:  MIT
-## upstream: https://github.com/catppuccin/kitty/blob/main/mocha.conf
-## blurb:    Soothing pastel theme for the high-spirited!
-
-
-
-# The basic colors
-foreground              #CDD6F4
-background              #1E1E2E
-selection_foreground    #1E1E2E
-selection_background    #F5E0DC
-
-# Cursor colors
-cursor                  #F5E0DC
-cursor_text_color       #1E1E2E
-
-# URL underline color when hovering with mouse
-url_color               #B4BEFE
-
-# Kitty window border colors
-active_border_color     #CBA6F7
-inactive_border_color   #8E95B3
-bell_border_color       #EBA0AC
-
-# OS Window titlebar colors
-wayland_titlebar_color system
-macos_titlebar_color system
-
-# Tab bar colors
-active_tab_foreground   #11111B
-active_tab_background   #CBA6F7
-inactive_tab_foreground #CDD6F4
-inactive_tab_background #181825
-tab_bar_background      #11111B
-
-# Colors for marks (marked text in the terminal)
-mark1_foreground #1E1E2E
-mark1_background #87B0F9
-mark2_foreground #1E1E2E
-mark2_background #CBA6F7
-mark3_foreground #1E1E2E
-mark3_background #74C7EC
-
-# The 16 terminal colors
-
-# black
-color0 #43465A
-color8 #43465A
-
-# red
-color1 #F38BA8
-color9 #F38BA8
-
-# green
-color2  #A6E3A1
-color10 #A6E3A1
-
-# yellow
-color3  #F9E2AF
-color11 #F9E2AF
-
-# blue
-color4  #87B0F9
-color12 #87B0F9
-
-# magenta
-color5  #F5C2E7
-color13 #F5C2E7
-
-# cyan
-color6  #94E2D5
-color14 #94E2D5
-
-# white
-color7  #CDD6F4
-color15 #A1A8C9
diff --git a/themes/catppuccin/mako.ini b/themes/catppuccin/mako.ini
deleted file mode 100644
index e530b7d5..00000000
--- a/themes/catppuccin/mako.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-include=~/.local/share/omarchy/default/mako/core.ini
-
-text-color=#cad3f5
-border-color=#c6d0f5
-background-color=#24273a
diff --git a/themes/catppuccin/swayosd.css b/themes/catppuccin/swayosd.css
deleted file mode 100644
index 0ff80d2a..00000000
--- a/themes/catppuccin/swayosd.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@define-color background-color #24273a;
-@define-color border-color #c6d0f5;
-@define-color label #cad3f5;
-@define-color image #cad3f5;
-@define-color progress #cad3f5;
diff --git a/themes/catppuccin/walker.css b/themes/catppuccin/walker.css
deleted file mode 100644
index 4b0d346f..00000000
--- a/themes/catppuccin/walker.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@define-color selected-text #8caaee;
-@define-color text #c6d0f5;
-@define-color base #24273a;
-@define-color border #c6d0f5;
-@define-color foreground #c6d0f5;
-@define-color background #24273a;
diff --git a/themes/catppuccin/waybar.css b/themes/catppuccin/waybar.css
deleted file mode 100644
index bf35a404..00000000
--- a/themes/catppuccin/waybar.css
+++ /dev/null
@@ -1,2 +0,0 @@
-@define-color foreground #cdd6f4;
-@define-color background #181824;
diff --git a/themes/ethereal/alacritty.toml b/themes/ethereal/alacritty.toml
deleted file mode 100644
index 215c3c09..00000000
--- a/themes/ethereal/alacritty.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-[colors]
-[colors.primary]
-background = "#060B1E"
-foreground = "#ffcead"
-
-[colors.normal]
-black   = "#060B1E"
-red     = "#ED5B5A"
-green   = "#92a593"
-yellow  = "#E9BB4F"
-blue    = "#7d82d9"
-magenta = "#c89dc1"
-cyan    = "#a3bfd1"
-white   = "#F99957"
-
-[colors.bright]
-black   = "#6d7db6"
-red     = "#faaaa9"
-green   = "#c4cfc4"
-yellow  = "#f7dc9c"
-blue    = "#c2c4f0"
-magenta = "#ead7e7"
-cyan    = "#dfeaf0"
-white   = "#ffcead"
-
-[colors.cursor]
-text   = "#060B1E"
-cursor = "#ffcead"
diff --git a/themes/ethereal/colors.toml b/themes/ethereal/colors.toml
new file mode 100644
index 00000000..3cbe19b7
--- /dev/null
+++ b/themes/ethereal/colors.toml
@@ -0,0 +1,26 @@
+accent = "#7d82d9"
+active_border_color = "#7d82d9"
+active_tab_background = "#060B1E"
+
+cursor = "#ffcead"
+foreground = "#ffcead"
+background = "#060B1E"
+selection_foreground = "#060B1E"
+selection_background = "#ffcead"
+
+color0 = "#060B1E"
+color1 = "#ED5B5A"
+color2 = "#92a593"
+color3 = "#E9BB4F"
+color4 = "#7d82d9"
+color5 = "#c89dc1"
+color6 = "#a3bfd1"
+color7 = "#F99957"
+color8 = "#6d7db6"
+color9 = "#faaaa9"
+color10 = "#c4cfc4"
+color11 = "#f7dc9c"
+color12 = "#c2c4f0"
+color13 = "#ead7e7"
+color14 = "#dfeaf0"
+color15 = "#ffcead"
diff --git a/themes/ethereal/ghostty.conf b/themes/ethereal/ghostty.conf
deleted file mode 100644
index 1ac9168b..00000000
--- a/themes/ethereal/ghostty.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# Background and foreground colors
-background = #060B1E
-foreground = #ffcead
-
-# Standard colors
-palette = 0=#060B1E
-palette = 1=#ED5B5A
-palette = 2=#92a593
-palette = 3=#E9BB4F
-palette = 4=#7d82d9
-palette = 5=#c89dc1
-palette = 6=#a3bfd1
-palette = 7=#F99957
-
-# Bright colors
-palette = 8=#6d7db6
-palette = 9=#faaaa9
-palette = 10=#c4cfc4
-palette = 11=#f7dc9c
-palette = 12=#c2c4f0
-palette = 13=#ead7e7
-palette = 14=#dfeaf0
-palette = 15=#ffcead
diff --git a/themes/ethereal/hyprland.conf b/themes/ethereal/hyprland.conf
deleted file mode 100644
index 9b72328f..00000000
--- a/themes/ethereal/hyprland.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file is not a full hyprland configuration.
-# It is intended to be included in your main hyprland.conf.
-
-$activeBorderColor = rgb(4E85D8)
-
-general {
-    col.active_border = $activeBorderColor
-}
-
-group {
-    col.border_active = $activeBorderColor
-}
diff --git a/themes/ethereal/hyprlock.conf b/themes/ethereal/hyprlock.conf
deleted file mode 100644
index 7d9b62e2..00000000
--- a/themes/ethereal/hyprlock.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-$color = rgba(6, 11, 30, 1)
-$inner_color = rgba(6, 11, 30, 0.66)
-$outer_color = rgba(200, 157, 193, 1)
-$font_color = rgba(255, 206, 173, 1)
-$placeholder_color = rgba(255, 206, 173, 0.7)
-$check_color = rgba(163, 191, 209, 1)
diff --git a/themes/ethereal/kitty.conf b/themes/ethereal/kitty.conf
deleted file mode 100644
index fe3bae7d..00000000
--- a/themes/ethereal/kitty.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-background #060B1E
-foreground #ffcead
-
-# black
-color0  #060B1E
-color8  #6d7db6
-
-# red
-color1  #ED5B5A
-color9  #faaaa9
-
-# green
-color2  #92a593
-color10 #c4cfc4
-
-# yellow
-color3  #E9BB4F
-color11 #f7dc9c
-
-# blue
-color4  #7d82d9
-color12 #c2c4f0
-
-# magenta
-color5  #c89dc1
-color13 #ead7e7
-
-#cyan
-color6  #a3bfd1
-color14 #dfeaf0
-
-#white
-color7  #F99957
-color15 #ffcead
diff --git a/themes/ethereal/mako.ini b/themes/ethereal/mako.ini
deleted file mode 100644
index fde27a45..00000000
--- a/themes/ethereal/mako.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-text-color=#ffcead
-border-color=#c89dc1
-background-color=#060B1E
-width=420
-height=110
-padding=10
-border-size=2
-font=Liberation Sans 11
-anchor=top-right
-outer-margin=20
-default-timeout=5000
-max-icon-size=32
-
-[app-name=Spotify]
-invisible=1
-
-[mode=do-not-disturb]
-invisible=true
-
-[mode=do-not-disturb app-name=notify-send]
-invisible=false
diff --git a/themes/ethereal/swayosd.css b/themes/ethereal/swayosd.css
deleted file mode 100644
index 7cdfeead..00000000
--- a/themes/ethereal/swayosd.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@define-color background-color #060B1E;
-@define-color border-color #6d7db6;
-@define-color label #ffcead;
-@define-color image #ffcead;
-@define-color progress #E9BB4F;
\ No newline at end of file
diff --git a/themes/ethereal/walker.css b/themes/ethereal/walker.css
deleted file mode 100644
index ceb5d953..00000000
--- a/themes/ethereal/walker.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@define-color selected-text #7d82d9;
-@define-color text #ffcead;
-@define-color base #060B1E;
-@define-color border #6d7db6;
-@define-color foreground #ffcead;
-@define-color background #060B1E;
diff --git a/themes/ethereal/waybar.css b/themes/ethereal/waybar.css
deleted file mode 100644
index d03dff38..00000000
--- a/themes/ethereal/waybar.css
+++ /dev/null
@@ -1,2 +0,0 @@
-@define-color background #060B1E;
-@define-color foreground #ffcead;
diff --git a/themes/everforest/alacritty.toml b/themes/everforest/alacritty.toml
deleted file mode 100644
index faf62fac..00000000
--- a/themes/everforest/alacritty.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-[colors]
-[colors.primary]
-background = '#2d353b'
-foreground = '#d3c6aa'
-
-[colors.normal]
-black = '#475258'
-red = '#e67e80'
-green = '#a7c080'
-yellow = '#dbbc7f'
-blue = '#7fbbb3'
-magenta = '#d699b6'
-cyan = '#83c092'
-white = '#d3c6aa'
-
-[colors.bright]
-black = '#475258'
-red = '#e67e80'
-green = '#a7c080'
-yellow = '#dbbc7f'
-blue = '#7fbbb3'
-magenta = '#d699b6'
-cyan = '#83c092'
-white = '#d3c6aa'
diff --git a/themes/everforest/colors.toml b/themes/everforest/colors.toml
new file mode 100644
index 00000000..f2e61588
--- /dev/null
+++ b/themes/everforest/colors.toml
@@ -0,0 +1,26 @@
+accent = "#7fbbb3"
+active_border_color = "#7fbbb3"
+active_tab_background = "#2d353b"
+
+cursor = "#d3c6aa"
+foreground = "#d3c6aa"
+background = "#2d353b"
+selection_foreground = "#2d353b"
+selection_background = "#d3c6aa"
+
+color0 = "#475258"
+color1 = "#e67e80"
+color2 = "#a7c080"
+color3 = "#dbbc7f"
+color4 = "#7fbbb3"
+color5 = "#d699b6"
+color6 = "#83c092"
+color7 = "#d3c6aa"
+color8 = "#475258"
+color9 = "#e67e80"
+color10 = "#a7c080"
+color11 = "#dbbc7f"
+color12 = "#7fbbb3"
+color13 = "#d699b6"
+color14 = "#83c092"
+color15 = "#d3c6aa"
diff --git a/themes/everforest/ghostty.conf b/themes/everforest/ghostty.conf
deleted file mode 100644
index 6208b9ce..00000000
--- a/themes/everforest/ghostty.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-background = #2d353b
-foreground = #d3c6aa
-
-palette = 0=#475258
-palette = 1=#e67e80
-palette = 2=#a7c080
-palette = 3=#dbbc7f
-palette = 4=#7fbbb3
-palette = 5=#d699b6
-palette = 6=#83c092
-palette = 7=#d3c6aa
-
-palette = 8=#475258
-palette = 9=#e67e80
-palette = 10=#a7c080
-palette = 11=#dbbc7f
-palette = 12=#7fbbb3
-palette = 13=#d699b6
-palette = 14=#83c092
-palette = 15=#d3c6aa
diff --git a/themes/everforest/hyprland-preview-share-picker.css b/themes/everforest/hyprland-preview-share-picker.css
deleted file mode 100644
index 58a15be3..00000000
--- a/themes/everforest/hyprland-preview-share-picker.css
+++ /dev/null
@@ -1,94 +0,0 @@
-@define-color foreground #d3c6aa;
-@define-color background #2d353b;
-@define-color accent #a7c080;
-@define-color muted #475258;
-@define-color card_bg #333c43;
-@define-color text_dark #2d353b;
-@define-color accent_hover #83c092;
-@define-color selected_tab #a7c080;
-@define-color text #d3c6aa;
-
-* {
-  all: unset;
-  font-family: JetBrains Mono NF;
-  color: @foreground;
-  font-weight: bold;
-  font-size: 16px;
-}
-
-.window {
-  background: alpha(@background, 0.95);
-  border: solid 2px @accent;
-  margin: 4px;
-  padding: 18px;
-}
-
-tabs {
-    padding: 0.5rem 1rem;
-}
-
-tabs > tab {
-    margin-right: 1rem;
-}
-
-.tab-label {
-    color: @text;
-    transition: all 0.2s ease;
-}
-
-tabs > tab:checked > .tab-label, tabs > tab:active > .tab-label {
-    text-decoration: underline currentColor;
-    color: @selected_tab;
-}
-
-tabs > tab:focus > .tab-label {
-    color: @foreground;
-}
-
-.page {
-    padding: 1rem;
-}
-
-.image-label {
-    font-size: 12px;
-    padding: 0.25rem;
-}
-
-flowboxchild > .card, button > .card {
-    transition: all 0.2s ease;
-    border: solid 2px transparent;
-    border-color: @background;
-    border-radius: 5px;
-    background-color: @card_bg;
-    padding: 5px;
-}
-
-flowboxchild:hover > .card, button:hover > .card, flowboxchild:active > .card, flowboxchild:selected > .card, button:active > .card, button:selected > .card, button:focus > .card {
-    border: solid 2px @accent;
-}
-
-.image {
-    border-radius: 5px;
-}
-
-.region-button {
-    padding: 0.5rem 1rem;
-    border-radius: 5px;
-    background-color: @accent;
-    color: @text_dark;
-    transition: all 0.2s ease;
-}
-
-.region-button > label {
-    color: @text_dark;
-}
-
-.region-button:not(:disabled):hover, .region-button:not(:disabled):focus {
-    background-color: @accent_hover;
-    color: @text_dark;
-}
-
-.region-button:disabled {
-    background-color: @muted;
-    color: @background;
-}
diff --git a/themes/everforest/hyprland.conf b/themes/everforest/hyprland.conf
deleted file mode 100644
index 10e2c5d4..00000000
--- a/themes/everforest/hyprland.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-$activeBorderColor = rgb(d3c6aa)
-
-general {
-    col.active_border = $activeBorderColor
-}
-
-group {
-    col.border_active = $activeBorderColor
-}
diff --git a/themes/everforest/hyprlock.conf b/themes/everforest/hyprlock.conf
deleted file mode 100644
index 11359524..00000000
--- a/themes/everforest/hyprlock.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-$color = rgba(45,53,59,1.0)
-$inner_color = rgba(45,53,59,0.8)
-$outer_color = rgba(211,198,170,1.0)
-$font_color = rgba(211,198,170,1.0)
-$check_color = rgba(131, 192, 146, 1.0)
diff --git a/themes/everforest/kitty.conf b/themes/everforest/kitty.conf
deleted file mode 100644
index 825cac23..00000000
--- a/themes/everforest/kitty.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-## name: Everforest Dark Hard
-## author: Sainnhe Park
-## license: MIT
-## upstream: https://github.com/ewal/kitty-everforest/blob/master/themes/everforest_dark_hard.conf
-## blurb: A green based color scheme designed to be warm and soft
-
-background            #2d353b
-foreground            #d3c6aa
-
-# Normal colors
-color0                #475258
-color1                #e67e80
-color2                #a7c080
-color3                #dbbc7f
-color4                #7fbbb3
-color5                #d699b6
-color6                #83c092
-color7                #d3c6aa
-
-# Bright colors
-color8                #475258
-color9                #e67e80
-color10               #a7c080
-color11               #dbbc7f
-color12               #7fbbb3
-color13               #d699b6
-color14               #83c092
-color15               #d3c6aa
diff --git a/themes/everforest/mako.ini b/themes/everforest/mako.ini
deleted file mode 100644
index 0008121f..00000000
--- a/themes/everforest/mako.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-include=~/.local/share/omarchy/default/mako/core.ini
-
-text-color=#d3c6aa
-border-color=#d3c6aa
-background-color=#2d353b
diff --git a/themes/everforest/swayosd.css b/themes/everforest/swayosd.css
deleted file mode 100644
index f0bff409..00000000
--- a/themes/everforest/swayosd.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@define-color background-color #2d353b;
-@define-color border-color #d3c6aa;
-@define-color label #d3c6aa;
-@define-color image #d3c6aa;
-@define-color progress #d3c6aa;
-
diff --git a/themes/everforest/walker.css b/themes/everforest/walker.css
deleted file mode 100644
index 56d6e569..00000000
--- a/themes/everforest/walker.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@define-color selected-text #dbbc7f;
-@define-color text #d3c6aa;
-@define-color base #2d353b;
-@define-color border #d3c6aa;
-@define-color foreground #d3c6aa;
-@define-color background #2d353b;
diff --git a/themes/everforest/waybar.css b/themes/everforest/waybar.css
deleted file mode 100644
index e8249f7e..00000000
--- a/themes/everforest/waybar.css
+++ /dev/null
@@ -1,2 +0,0 @@
-@define-color foreground #d3c6aa;
-@define-color background #2d353b;
diff --git a/themes/flexoki-light/alacritty.toml b/themes/flexoki-light/alacritty.toml
deleted file mode 100644
index e59fce8b..00000000
--- a/themes/flexoki-light/alacritty.toml
+++ /dev/null
@@ -1,39 +0,0 @@
-[colors.bright]
-black = "#100F0F"
-blue = "#205EA6"
-cyan = "#3AA99F"
-green = "#879A39"
-magenta = "#CE5D97"
-red = "#D14D41"
-white = "#FFFCF0"
-yellow = "#D0A215"
-
-[colors.cursor]
-cursor = "#100F0F"
-text = "#FFFCF0"
-
-[colors.dim]
-black = "#100F0F"
-blue = "#205EA6"
-cyan = "#3AA99F"
-green = "#879A39"
-magenta = "#CE5D97"
-red = "#D14D41"
-white = "#FFFCF0"
-yellow = "#D0A215"
-
-[colors.normal]
-black = "#100F0F"
-blue = "#205EA6"
-cyan = "#3AA99F"
-green = "#879A39"
-magenta = "#CE5D97"
-red = "#D14D41"
-white = "#FFFCF0"
-yellow = "#D0A215"
-
-[colors.primary]
-background = "#FFFCF0"
-bright_foreground = "#100F0F"
-dim_foreground = "#100F0F"
-foreground = "#100F0F"
diff --git a/themes/flexoki-light/colors.toml b/themes/flexoki-light/colors.toml
new file mode 100644
index 00000000..b5e3a622
--- /dev/null
+++ b/themes/flexoki-light/colors.toml
@@ -0,0 +1,26 @@
+accent = "#205EA6"
+active_border_color = "#D14D41"
+active_tab_background = "#CECDC3"
+
+cursor = "#100F0F"
+foreground = "#100F0F"
+background = "#FFFCF0"
+selection_foreground = "#100F0F"
+selection_background = "#CECDC3"
+
+color0 = "#100F0F"
+color1 = "#D14D41"
+color2 = "#879A39"
+color3 = "#D0A215"
+color4 = "#205EA6"
+color5 = "#CE5D97"
+color6 = "#3AA99F"
+color7 = "#FFFCF0"
+color8 = "#100F0F"
+color9 = "#D14D41"
+color10 = "#879A39"
+color11 = "#D0A215"
+color12 = "#4385BE"
+color13 = "#CE5D97"
+color14 = "#3AA99F"
+color15 = "#FFFCF0"
diff --git a/themes/flexoki-light/ghostty.conf b/themes/flexoki-light/ghostty.conf
deleted file mode 100644
index 5bc755a1..00000000
--- a/themes/flexoki-light/ghostty.conf
+++ /dev/null
@@ -1 +0,0 @@
-theme = Flexoki Light
\ No newline at end of file
diff --git a/themes/flexoki-light/hyprland-preview-share-picker.css b/themes/flexoki-light/hyprland-preview-share-picker.css
deleted file mode 100644
index 33faa53f..00000000
--- a/themes/flexoki-light/hyprland-preview-share-picker.css
+++ /dev/null
@@ -1,94 +0,0 @@
-@define-color foreground #100F0F;
-@define-color background #FFFCF0;
-@define-color accent #205EA6;
-@define-color muted #6F6E69;
-@define-color card_bg #F2F0E5;
-@define-color text_dark #FFFCF0;
-@define-color accent_hover #4385BE;
-@define-color selected_tab #205EA6;
-@define-color text #100F0F;
-
-* {
-  all: unset;
-  font-family: JetBrains Mono NF;
-  color: @foreground;
-  font-weight: bold;
-  font-size: 16px;
-}
-
-.window {
-  background: alpha(@background, 0.95);
-  border: solid 2px @accent;
-  margin: 4px;
-  padding: 18px;
-}
-
-tabs {
-    padding: 0.5rem 1rem;
-}
-
-tabs > tab {
-    margin-right: 1rem;
-}
-
-.tab-label {
-    color: @text;
-    transition: all 0.2s ease;
-}
-
-tabs > tab:checked > .tab-label, tabs > tab:active > .tab-label {
-    text-decoration: underline currentColor;
-    color: @selected_tab;
-}
-
-tabs > tab:focus > .tab-label {
-    color: @foreground;
-}
-
-.page {
-    padding: 1rem;
-}
-
-.image-label {
-    font-size: 12px;
-    padding: 0.25rem;
-}
-
-flowboxchild > .card, button > .card {
-    transition: all 0.2s ease;
-    border: solid 2px transparent;
-    border-color: @background;
-    border-radius: 5px;
-    background-color: @card_bg;
-    padding: 5px;
-}
-
-flowboxchild:hover > .card, button:hover > .card, flowboxchild:active > .card, flowboxchild:selected > .card, button:active > .card, button:selected > .card, button:focus > .card {
-    border: solid 2px @accent;
-}
-
-.image {
-    border-radius: 5px;
-}
-
-.region-button {
-    padding: 0.5rem 1rem;
-    border-radius: 5px;
-    background-color: @accent;
-    color: @text_dark;
-    transition: all 0.2s ease;
-}
-
-.region-button > label {
-    color: @text_dark;
-}
-
-.region-button:not(:disabled):hover, .region-button:not(:disabled):focus {
-    background-color: @accent_hover;
-    color: @text_dark;
-}
-
-.region-button:disabled {
-    background-color: @muted;
-    color: @background;
-}
diff --git a/themes/flexoki-light/hyprland.conf b/themes/flexoki-light/hyprland.conf
deleted file mode 100644
index 1baef471..00000000
--- a/themes/flexoki-light/hyprland.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-$activeBorderColor = rgba(205EA6ee)
-
-general {
-    col.active_border = $activeBorderColor
-}
-
-group {
-    col.border_active = $activeBorderColor
-}
diff --git a/themes/flexoki-light/hyprlock.conf b/themes/flexoki-light/hyprlock.conf
deleted file mode 100644
index e1d0dd4a..00000000
--- a/themes/flexoki-light/hyprlock.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-$color = rgba(255,252,240,1.0)
-$inner_color = rgba(242,240,229,1.0)
-$outer_color = rgba(206,205,195,1.0)
-$font_color = rgba(16,15,15,1.0)
-$check_color = rgba(32, 94, 166, 1.0)
diff --git a/themes/flexoki-light/kitty.conf b/themes/flexoki-light/kitty.conf
deleted file mode 100644
index c8ee0142..00000000
--- a/themes/flexoki-light/kitty.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-# vim:ft=kitty
-
-## name: Flexoki (Light)
-## author: Kepano
-## license: MIT
-## upstream: https://raw.githubusercontent.com/kepano/flexoki/main/kitty/flexoki_light.conf
-## blurb: An inky color scheme for prose and code
-
-# The basic colors
-foreground              #100F0F
-background              #FFFCF0
-selection_foreground    #100F0F
-selection_background    #CECDC3
-
-# Cursor colors
-cursor                  #100F0F
-cursor_text_color       #FFFCF0
-
-# kitty window border colors
-active_border_color     #D14D41
-inactive_border_color   #CECDC3
-
-# Tab bar colors
-active_tab_foreground   #100F0F
-active_tab_background   #CECDC3
-inactive_tab_foreground #6F6E69
-inactive_tab_background #E6E4D9
-
-# The basic 16 colors
-# black
-color0 #100F0F
-color8 #6F6E69
-
-
-# red
-color1  #D14D41
-color9  #AF3029
-
-
-# green
-color2  #879A39
-color10 #66800B
-
-
-# yellow
-color3  #D0A215
-color11 #AD8301
-
-
-# blue
-color4  #4385BE
-color12 #205EA6
-
-
-# magenta
-color5  #CE5D97
-color13 #A02F6F
-
-
-# cyan
-color6  #3AA99F
-color14 #24837B
-
-
-# white
-color7  #FFFCF0
-color15 #F2F0E5
\ No newline at end of file
diff --git a/themes/flexoki-light/mako.ini b/themes/flexoki-light/mako.ini
deleted file mode 100644
index 19cf1af4..00000000
--- a/themes/flexoki-light/mako.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-include=~/.local/share/omarchy/default/mako/core.ini
-
-text-color=#100F0F
-border-color=#205EA6
-background-color=#FFFCF0
diff --git a/themes/flexoki-light/swayosd.css b/themes/flexoki-light/swayosd.css
deleted file mode 100644
index 444964d5..00000000
--- a/themes/flexoki-light/swayosd.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@define-color background-color #FFFCF0;
-@define-color border-color #205EA6;
-@define-color label #100F0F;
-@define-color image #100F0F;
-@define-color progress #100F0F;
diff --git a/themes/flexoki-light/walker.css b/themes/flexoki-light/walker.css
deleted file mode 100644
index e2ecdfb2..00000000
--- a/themes/flexoki-light/walker.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@define-color selected-text #205EA6;
-@define-color text #100F0F;
-@define-color base #FFFCF0;
-@define-color border #205EA6;
-@define-color foreground #100F0F;
-@define-color background #FFFCF0;
diff --git a/themes/flexoki-light/waybar.css b/themes/flexoki-light/waybar.css
deleted file mode 100644
index edc54c16..00000000
--- a/themes/flexoki-light/waybar.css
+++ /dev/null
@@ -1,2 +0,0 @@
-@define-color foreground #100F0F;
-@define-color background #FFFCF0;
diff --git a/themes/gruvbox/alacritty.toml b/themes/gruvbox/alacritty.toml
deleted file mode 100644
index 03f4b615..00000000
--- a/themes/gruvbox/alacritty.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-[colors]
-[colors.primary]
-background = "0x282828"
-foreground = "0xd4be98"
-
-[colors.normal]
-black = "0x3c3836"
-red = "0xea6962"
-green = "0xa9b665"
-yellow = "0xd8a657"
-blue = "0x7daea3"
-magenta = "0xd3869b"
-cyan = "0x89b482"
-white = "0xd4be98"
-
-[colors.bright]
-black = "0x3c3836"
-red = "0xea6962"
-green = "0xa9b665"
-yellow = "0xd8a657"
-blue = "0x7daea3"
-magenta = "0xd3869b"
-cyan = "0x89b482"
-white = "0xd4be98"
diff --git a/themes/gruvbox/colors.toml b/themes/gruvbox/colors.toml
new file mode 100644
index 00000000..b6e7b351
--- /dev/null
+++ b/themes/gruvbox/colors.toml
@@ -0,0 +1,26 @@
+accent = "#7daea3"
+active_border_color = "#458588"
+active_tab_background = "#d65d0e"
+
+cursor = "#bdae93"
+foreground = "#d4be98"
+background = "#282828"
+selection_foreground = "#ebdbb2"
+selection_background = "#d65d0e"
+
+color0 = "#3c3836"
+color1 = "#ea6962"
+color2 = "#a9b665"
+color3 = "#d8a657"
+color4 = "#7daea3"
+color5 = "#d3869b"
+color6 = "#89b482"
+color7 = "#d4be98"
+color8 = "#3c3836"
+color9 = "#ea6962"
+color10 = "#a9b665"
+color11 = "#d8a657"
+color12 = "#7daea3"
+color13 = "#d3869b"
+color14 = "#89b482"
+color15 = "#d4be98"
diff --git a/themes/gruvbox/ghostty.conf b/themes/gruvbox/ghostty.conf
deleted file mode 100644
index dbb7464e..00000000
--- a/themes/gruvbox/ghostty.conf
+++ /dev/null
@@ -1 +0,0 @@
-theme = Gruvbox Dark
diff --git a/themes/gruvbox/hyprland-preview-share-picker.css b/themes/gruvbox/hyprland-preview-share-picker.css
deleted file mode 100644
index c3a552c4..00000000
--- a/themes/gruvbox/hyprland-preview-share-picker.css
+++ /dev/null
@@ -1,94 +0,0 @@
-@define-color foreground #ebdbb2;
-@define-color background #282828;
-@define-color accent #d65d0e;
-@define-color muted #928374;
-@define-color card_bg #3c3836;
-@define-color text_dark #282828;
-@define-color accent_hover #fabd2f;
-@define-color selected_tab #d65d0e;
-@define-color text #ebdbb2;
-
-* {
-  all: unset;
-  font-family: JetBrains Mono NF;
-  color: @foreground;
-  font-weight: bold;
-  font-size: 16px;
-}
-
-.window {
-  background: alpha(@background, 0.95);
-  border: solid 2px @accent;
-  margin: 4px;
-  padding: 18px;
-}
-
-tabs {
-    padding: 0.5rem 1rem;
-}
-
-tabs > tab {
-    margin-right: 1rem;
-}
-
-.tab-label {
-    color: @text;
-    transition: all 0.2s ease;
-}
-
-tabs > tab:checked > .tab-label, tabs > tab:active > .tab-label {
-    text-decoration: underline currentColor;
-    color: @selected_tab;
-}
-
-tabs > tab:focus > .tab-label {
-    color: @foreground;
-}
-
-.page {
-    padding: 1rem;
-}
-
-.image-label {
-    font-size: 12px;
-    padding: 0.25rem;
-}
-
-flowboxchild > .card, button > .card {
-    transition: all 0.2s ease;
-    border: solid 2px transparent;
-    border-color: @background;
-    border-radius: 5px;
-    background-color: @card_bg;
-    padding: 5px;
-}
-
-flowboxchild:hover > .card, button:hover > .card, flowboxchild:active > .card, flowboxchild:selected > .card, button:active > .card, button:selected > .card, button:focus > .card {
-    border: solid 2px @accent;
-}
-
-.image {
-    border-radius: 5px;
-}
-
-.region-button {
-    padding: 0.5rem 1rem;
-    border-radius: 5px;
-    background-color: @accent;
-    color: @text_dark;
-    transition: all 0.2s ease;
-}
-
-.region-button > label {
-    color: @text_dark;
-}
-
-.region-button:not(:disabled):hover, .region-button:not(:disabled):focus {
-    background-color: @accent_hover;
-    color: @text_dark;
-}
-
-.region-button:disabled {
-    background-color: @muted;
-    color: @background;
-}
diff --git a/themes/gruvbox/hyprland.conf b/themes/gruvbox/hyprland.conf
deleted file mode 100644
index 029cc908..00000000
--- a/themes/gruvbox/hyprland.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-$activeBorderColor = rgb(a89984)
-
-general {
-    col.active_border = $activeBorderColor
-}
-
-group {
-    col.border_active = $activeBorderColor
-}
diff --git a/themes/gruvbox/hyprlock.conf b/themes/gruvbox/hyprlock.conf
deleted file mode 100644
index 1d18e4f5..00000000
--- a/themes/gruvbox/hyprlock.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-$color = rgba(40,40,40,1.0)
-$inner_color = rgba(40,40,40,0.8)
-$outer_color = rgba(212,190,152,1.0)
-$font_color = rgba(212,190,152,1.0)
-$check_color = rgba(214, 153, 92, 1.0)
diff --git a/themes/gruvbox/kitty.conf b/themes/gruvbox/kitty.conf
deleted file mode 100644
index 38b015cc..00000000
--- a/themes/gruvbox/kitty.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-## name: Gruvbox Dark
-## author: Pavel Pertsev
-## license: MIT/X11
-## upstream: https://raw.githubusercontent.com/gruvbox-community/gruvbox-contrib/master/kitty/gruvbox-dark.conf
-
-selection_foreground    #ebdbb2
-selection_background    #d65d0e
-
-background              #282828
-foreground              #ebdbb2
-
-color0                  #3c3836
-color1                  #cc241d
-color2                  #98971a
-color3                  #d79921
-color4                  #458588
-color5                  #b16286
-color6                  #689d6a
-color7                  #a89984
-color8                  #928374
-color9                  #fb4934
-color10                 #b8bb26
-color11                 #fabd2f
-color12                 #83a598
-color13                 #d3869b
-color14                 #8ec07c
-color15                 #fbf1c7
-
-cursor                  #bdae93
-cursor_text_color       #665c54
-
-url_color               #458588
-
-# START_AUTOGENERATED_TAB_STYLE
-# Feel free to update these colors manually and remove these comments.
-active_tab_foreground   #eeeeee
-active_tab_background   #d65d0e
-inactive_tab_foreground #ebdbb2
-inactive_tab_background #202020
-# END_AUTOGENERATED_TAB_STYLE
diff --git a/themes/gruvbox/mako.ini b/themes/gruvbox/mako.ini
deleted file mode 100644
index 5d2d17cc..00000000
--- a/themes/gruvbox/mako.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-include=~/.local/share/omarchy/default/mako/core.ini
-
-text-color=#d4be98
-border-color=#a89984
-background-color=#282828
diff --git a/themes/gruvbox/swayosd.css b/themes/gruvbox/swayosd.css
deleted file mode 100644
index 16240ae0..00000000
--- a/themes/gruvbox/swayosd.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@define-color background-color #282828;
-@define-color border-color #a89984;
-@define-color label #ebdbb2;
-@define-color image #ebdbb2;
-@define-color progress #ebdbb2;
-
diff --git a/themes/gruvbox/walker.css b/themes/gruvbox/walker.css
deleted file mode 100644
index 6192cd6c..00000000
--- a/themes/gruvbox/walker.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@define-color selected-text #fabd2f;
-@define-color text #ebdbb2;
-@define-color base #282828;
-@define-color border #ebdbb2;
-@define-color foreground #ebdbb2;
-@define-color background #282828;
diff --git a/themes/gruvbox/waybar.css b/themes/gruvbox/waybar.css
deleted file mode 100644
index 598de57a..00000000
--- a/themes/gruvbox/waybar.css
+++ /dev/null
@@ -1,2 +0,0 @@
-@define-color foreground #d4be98;
-@define-color background #282828;
diff --git a/themes/hackerman/alacritty.toml b/themes/hackerman/alacritty.toml
deleted file mode 100644
index 120c8c3a..00000000
--- a/themes/hackerman/alacritty.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-[colors]
-[colors.primary]
-background = "#0B0C16"
-foreground = "#ddf7ff"
-
-[colors.normal]
-black   = "#0B0C16"
-red     = "#50f872"
-green   = "#4fe88f"
-yellow  = "#50f7d4"
-blue    = "#829dd4"
-magenta = "#86a7df"
-cyan    = "#7cf8f7"
-white   = "#85E1FB"
-
-[colors.bright]
-black   = "#6a6e95"
-red     = "#85ff9d"
-green   = "#9cf7c2"
-yellow  = "#a4ffec"
-blue    = "#c4d2ed"
-magenta = "#cddbf4"
-cyan    = "#d1fffe"
-white   = "#ddf7ff"
-
-[colors.cursor]
-text   = "#0B0C16"
-cursor = "#ddf7ff"
diff --git a/themes/hackerman/colors.toml b/themes/hackerman/colors.toml
new file mode 100644
index 00000000..90792645
--- /dev/null
+++ b/themes/hackerman/colors.toml
@@ -0,0 +1,26 @@
+accent = "#829dd4"
+active_border_color = "#829dd4"
+active_tab_background = "#0B0C16"
+
+cursor = "#ddf7ff"
+foreground = "#ddf7ff"
+background = "#0B0C16"
+selection_foreground = "#0B0C16"
+selection_background = "#ddf7ff"
+
+color0 = "#0B0C16"
+color1 = "#50f872"
+color2 = "#4fe88f"
+color3 = "#50f7d4"
+color4 = "#829dd4"
+color5 = "#86a7df"
+color6 = "#7cf8f7"
+color7 = "#85E1FB"
+color8 = "#6a6e95"
+color9 = "#85ff9d"
+color10 = "#9cf7c2"
+color11 = "#a4ffec"
+color12 = "#c4d2ed"
+color13 = "#cddbf4"
+color14 = "#d1fffe"
+color15 = "#ddf7ff"
diff --git a/themes/hackerman/ghostty.conf b/themes/hackerman/ghostty.conf
deleted file mode 100644
index e4ead98f..00000000
--- a/themes/hackerman/ghostty.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# Background and foreground colors
-background = #0B0C16
-foreground = #ddf7ff
-
-# Standard colors
-palette = 0=#0B0C16
-palette = 1=#50f872
-palette = 2=#4fe88f
-palette = 3=#50f7d4
-palette = 4=#829dd4
-palette = 5=#86a7df
-palette = 6=#7cf8f7
-palette = 7=#85E1FB
-
-# Bright colors
-palette = 8=#6a6e95
-palette = 9=#85ff9d
-palette = 10=#9cf7c2
-palette = 11=#a4ffec
-palette = 12=#c4d2ed
-palette = 13=#cddbf4
-palette = 14=#d1fffe
-palette = 15=#ddf7ff
diff --git a/themes/hackerman/hyprland-preview-share-picker.css b/themes/hackerman/hyprland-preview-share-picker.css
deleted file mode 100644
index 172122b7..00000000
--- a/themes/hackerman/hyprland-preview-share-picker.css
+++ /dev/null
@@ -1,94 +0,0 @@
-@define-color foreground #ddf7ff;
-@define-color background #0B0C16;
-@define-color accent #829dd4;
-@define-color muted #6a6e95;
-@define-color card_bg #141526;
-@define-color text_dark #0B0C16;
-@define-color accent_hover #c4d2ed;
-@define-color selected_tab #829dd4;
-@define-color text #ddf7ff;
-
-* {
-  all: unset;
-  font-family: JetBrains Mono NF;
-  color: @foreground;
-  font-weight: bold;
-  font-size: 16px;
-}
-
-.window {
-  background: alpha(@background, 0.95);
-  border: solid 2px @accent;
-  margin: 4px;
-  padding: 18px;
-}
-
-tabs {
-    padding: 0.5rem 1rem;
-}
-
-tabs > tab {
-    margin-right: 1rem;
-}
-
-.tab-label {
-    color: @text;
-    transition: all 0.2s ease;
-}
-
-tabs > tab:checked > .tab-label, tabs > tab:active > .tab-label {
-    text-decoration: underline currentColor;
-    color: @selected_tab;
-}
-
-tabs > tab:focus > .tab-label {
-    color: @foreground;
-}
-
-.page {
-    padding: 1rem;
-}
-
-.image-label {
-    font-size: 12px;
-    padding: 0.25rem;
-}
-
-flowboxchild > .card, button > .card {
-    transition: all 0.2s ease;
-    border: solid 2px transparent;
-    border-color: @background;
-    border-radius: 5px;
-    background-color: @card_bg;
-    padding: 5px;
-}
-
-flowboxchild:hover > .card, button:hover > .card, flowboxchild:active > .card, flowboxchild:selected > .card, button:active > .card, button:selected > .card, button:focus > .card {
-    border: solid 2px @accent;
-}
-
-.image {
-    border-radius: 5px;
-}
-
-.region-button {
-    padding: 0.5rem 1rem;
-    border-radius: 5px;
-    background-color: @accent;
-    color: @text_dark;
-    transition: all 0.2s ease;
-}
-
-.region-button > label {
-    color: @text_dark;
-}
-
-.region-button:not(:disabled):hover, .region-button:not(:disabled):focus {
-    background-color: @accent_hover;
-    color: @text_dark;
-}
-
-.region-button:disabled {
-    background-color: @muted;
-    color: @background;
-}
diff --git a/themes/hackerman/hyprland.conf b/themes/hackerman/hyprland.conf
deleted file mode 100644
index 92d76498..00000000
--- a/themes/hackerman/hyprland.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file is not a full hyprland configuration.
-# It is intended to be included in your main hyprland.conf.
-
-$activeBorderColor = rgba(26a269ee) rgba(2ec27eee) 45deg
-
-general {
-    col.active_border = $activeBorderColor
-}
-
-group {
-    col.border_active = $activeBorderColor
-}
diff --git a/themes/hackerman/hyprlock.conf b/themes/hackerman/hyprlock.conf
deleted file mode 100644
index 6a16b1ec..00000000
--- a/themes/hackerman/hyprlock.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-$color = rgba(11, 12, 22, 1)
-$inner_color = rgba(11, 12, 22, 0.66)
-$outer_color = rgba(134, 167, 223, 1)
-$font_color = rgba(221, 247, 255, 1)
-$placeholder_color = rgba(221, 247, 255, 0.7)
-$check_color = rgba(124, 248, 247, 1)
diff --git a/themes/hackerman/kitty.conf b/themes/hackerman/kitty.conf
deleted file mode 100644
index 628715f7..00000000
--- a/themes/hackerman/kitty.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-background            #0B0C16
-foreground            #ddf7ff
-
-# black
-color0  #0B0C16
-color8  #6a6e95
-
-# red
-color1  #50f872
-color9  #85ff9d
-
-# green
-color2  #4fe88f
-color10 #9cf7c2
-
-# yellow
-color3  #50f7d4
-color11 #a4ffec
-
-# blue
-color4  #829dd4
-color12 #c4d2ed
-
-# magenta
-color5  #86a7df
-color13 #cddbf4
-
-#cyan
-color6  #7cf8f7
-color14 #d1fffe
-
-#white
-color7  #85E1FB
-color15 #ddf7ff
diff --git a/themes/hackerman/mako.ini b/themes/hackerman/mako.ini
deleted file mode 100644
index 0727a1f1..00000000
--- a/themes/hackerman/mako.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-text-color=#ddf7ff
-border-color=#86a7df
-background-color=#0B0C16
-width=420
-height=110
-padding=10
-border-size=2
-font=Liberation Sans 11
-anchor=top-right
-outer-margin=20
-default-timeout=5000
-max-icon-size=32
-
-[app-name=Spotify]
-invisible=1
-
-[mode=do-not-disturb]
-invisible=true
-
-[mode=do-not-disturb app-name=notify-send]
-invisible=false
diff --git a/themes/hackerman/swayosd.css b/themes/hackerman/swayosd.css
deleted file mode 100644
index b89c9617..00000000
--- a/themes/hackerman/swayosd.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@define-color background-color #0B0C16;
-@define-color border-color #6a6e95;
-@define-color label #ddf7ff;
-@define-color image #ddf7ff;
-@define-color progress #50f7d4;
\ No newline at end of file
diff --git a/themes/hackerman/walker.css b/themes/hackerman/walker.css
deleted file mode 100644
index 82521c58..00000000
--- a/themes/hackerman/walker.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@define-color selected-text #829dd4;
-@define-color text #ddf7ff;
-@define-color base #0B0C16;
-@define-color border #6a6e95;
-@define-color foreground #ddf7ff;
-@define-color background #0B0C16;
diff --git a/themes/hackerman/waybar.css b/themes/hackerman/waybar.css
deleted file mode 100644
index 8f44e7a0..00000000
--- a/themes/hackerman/waybar.css
+++ /dev/null
@@ -1,2 +0,0 @@
-@define-color background #0B0C16;
-@define-color foreground #ddf7ff;
diff --git a/themes/kanagawa/alacritty.toml b/themes/kanagawa/alacritty.toml
deleted file mode 100644
index 341965c8..00000000
--- a/themes/kanagawa/alacritty.toml
+++ /dev/null
@@ -1,36 +0,0 @@
-[colors]
-[colors.primary]
-background = '#1f1f28'
-foreground = '#dcd7ba'
-
-[colors.normal]
-black   = '#090618'
-red     = '#c34043'
-green   = '#76946a'
-yellow  = '#c0a36e'
-blue    = '#7e9cd8'
-magenta = '#957fb8'
-cyan    = '#6a9589'
-white   = '#c8c093'
-
-[colors.bright]
-black   = '#727169'
-red     = '#e82424'
-green   = '#98bb6c'
-yellow  = '#e6c384'
-blue    = '#7fb4ca'
-magenta = '#938aa9'
-cyan    = '#7aa89f'
-white   = '#dcd7ba'
-
-[colors.selection]
-background = '#2d4f67'
-foreground = '#c8c093'
-
-[[colors.indexed_colors]]
-index = 16
-color = '#ffa066'
-
-[[colors.indexed_colors]]
-index = 17
-color = '#ff5d62'
diff --git a/themes/kanagawa/colors.toml b/themes/kanagawa/colors.toml
new file mode 100644
index 00000000..4e7b987e
--- /dev/null
+++ b/themes/kanagawa/colors.toml
@@ -0,0 +1,26 @@
+accent = "#7e9cd8"
+active_border_color = "#7e9cd8"
+active_tab_background = "#1f1f28"
+
+cursor = "#c8c093"
+foreground = "#dcd7ba"
+background = "#1f1f28"
+selection_foreground = "#c8c093"
+selection_background = "#2d4f67"
+
+color0 = "#090618"
+color1 = "#c34043"
+color2 = "#76946a"
+color3 = "#c0a36e"
+color4 = "#7e9cd8"
+color5 = "#957fb8"
+color6 = "#6a9589"
+color7 = "#c8c093"
+color8 = "#727169"
+color9 = "#e82424"
+color10 = "#98bb6c"
+color11 = "#e6c384"
+color12 = "#7fb4ca"
+color13 = "#938aa9"
+color14 = "#7aa89f"
+color15 = "#dcd7ba"
diff --git a/themes/kanagawa/ghostty.conf b/themes/kanagawa/ghostty.conf
deleted file mode 100644
index 4e26c720..00000000
--- a/themes/kanagawa/ghostty.conf
+++ /dev/null
@@ -1 +0,0 @@
-theme = Kanagawa Wave
diff --git a/themes/kanagawa/hyprland-preview-share-picker.css b/themes/kanagawa/hyprland-preview-share-picker.css
deleted file mode 100644
index 36f9c65f..00000000
--- a/themes/kanagawa/hyprland-preview-share-picker.css
+++ /dev/null
@@ -1,94 +0,0 @@
-@define-color foreground #dcd7ba;
-@define-color background #1f1f28;
-@define-color accent #7e9cd8;
-@define-color muted #727169;
-@define-color card_bg #2a2a37;
-@define-color text_dark #16161d;
-@define-color accent_hover #7fb4ca;
-@define-color selected_tab #7e9cd8;
-@define-color text #dcd7ba;
-
-* {
-  all: unset;
-  font-family: JetBrains Mono NF;
-  color: @foreground;
-  font-weight: bold;
-  font-size: 16px;
-}
-
-.window {
-  background: alpha(@background, 0.95);
-  border: solid 2px @accent;
-  margin: 4px;
-  padding: 18px;
-}
-
-tabs {
-    padding: 0.5rem 1rem;
-}
-
-tabs > tab {
-    margin-right: 1rem;
-}
-
-.tab-label {
-    color: @text;
-    transition: all 0.2s ease;
-}
-
-tabs > tab:checked > .tab-label, tabs > tab:active > .tab-label {
-    text-decoration: underline currentColor;
-    color: @selected_tab;
-}
-
-tabs > tab:focus > .tab-label {
-    color: @foreground;
-}
-
-.page {
-    padding: 1rem;
-}
-
-.image-label {
-    font-size: 12px;
-    padding: 0.25rem;
-}
-
-flowboxchild > .card, button > .card {
-    transition: all 0.2s ease;
-    border: solid 2px transparent;
-    border-color: @background;
-    border-radius: 5px;
-    background-color: @card_bg;
-    padding: 5px;
-}
-
-flowboxchild:hover > .card, button:hover > .card, flowboxchild:active > .card, flowboxchild:selected > .card, button:active > .card, button:selected > .card, button:focus > .card {
-    border: solid 2px @accent;
-}
-
-.image {
-    border-radius: 5px;
-}
-
-.region-button {
-    padding: 0.5rem 1rem;
-    border-radius: 5px;
-    background-color: @accent;
-    color: @text_dark;
-    transition: all 0.2s ease;
-}
-
-.region-button > label {
-    color: @text_dark;
-}
-
-.region-button:not(:disabled):hover, .region-button:not(:disabled):focus {
-    background-color: @accent_hover;
-    color: @text_dark;
-}
-
-.region-button:disabled {
-    background-color: @muted;
-    color: @background;
-}
diff --git a/themes/kanagawa/hyprlock.conf b/themes/kanagawa/hyprlock.conf
deleted file mode 100644
index 7608b2c5..00000000
--- a/themes/kanagawa/hyprlock.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-$color = rgba(31,31,40,1.0)
-$inner_color = rgba(31,31,40,0.8)
-$outer_color = rgba(220,215,186,1.0)
-$font_color = rgba(220,215,186,1.0)
-$check_color = rgba(126, 156, 216, 1.0)
diff --git a/themes/kanagawa/kitty.conf b/themes/kanagawa/kitty.conf
deleted file mode 100644
index 7122cea5..00000000
--- a/themes/kanagawa/kitty.conf
+++ /dev/null
@@ -1,68 +0,0 @@
-## name: Kanagawa
-## author: Tommaso Laurenzi
-## license: MIT
-## upstream: https://github.com/rebelot/kanagawa.nvim/
-## blurb: NeoVim dark colorscheme inspired by the colors of the famous painting
-## by Katsushika Hokusai.
-
-#: The basic colors
-
-foreground                      #dcd7ba
-background                      #1f1f28
-selection_foreground            #c8c093
-selection_background            #2d4f67
-
-#: Cursor colors
-
-cursor                          #c8c093
-
-#: URL underline color when overing with mouse
-
-url_color                       #72a7bc
-
-#: Tab bar colors
-
-active_tab_foreground           #c8c093
-active_tab_background           #1f1f28
-inactive_tab_foreground         #727169
-inactive_tab_background         #1f1f28
-
-#: The basic 16 colors
-
-#: black
-color0  #16161d
-color8  #727169
-
-#: red
-color1  #c34043
-color9  #e82424
-
-#: green
-color2  #76946a
-color10 #98bb6c
-
-#: yellow
-color3  #c0a36e
-color11 #e6c384
-
-#: blue
-color4  #7e9cd8
-color12 #7fb4ca
-
-#: magenta
-color5  #957fb8
-color13 #938aa9
-
-#: cyan
-color6  #6a9589
-color14 #7aa89f
-
-#: white
-color7  #c8c093
-color15 #dcd7ba
-
-
-#: You can set the remaining 240 colors as color16 to color255.
-
-color16 #ffa066
-color17 #ff5d62
diff --git a/themes/kanagawa/mako.ini b/themes/kanagawa/mako.ini
deleted file mode 100644
index ca2e939c..00000000
--- a/themes/kanagawa/mako.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-include=~/.local/share/omarchy/default/mako/core.ini
-
-text-color=#dcd7ba
-border-color=#dcd7ba
-background-color=#1f1f28
diff --git a/themes/kanagawa/swayosd.css b/themes/kanagawa/swayosd.css
deleted file mode 100644
index 1eb5c851..00000000
--- a/themes/kanagawa/swayosd.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@define-color background-color #1f1f28;
-@define-color border-color #dcd7ba;
-@define-color label #dcd7ba;
-@define-color image #dcd7ba;
-@define-color progress #dcd7ba;
-
diff --git a/themes/kanagawa/walker.css b/themes/kanagawa/walker.css
deleted file mode 100644
index 8284746c..00000000
--- a/themes/kanagawa/walker.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@define-color selected-text #dca561;
-@define-color text #dcd7ba;
-@define-color base #1f1f28;
-@define-color border #dcd7ba;
-@define-color foreground #dcd7ba;
-@define-color background #1f1f28;
diff --git a/themes/kanagawa/waybar.css b/themes/kanagawa/waybar.css
deleted file mode 100644
index 029cc07f..00000000
--- a/themes/kanagawa/waybar.css
+++ /dev/null
@@ -1,2 +0,0 @@
-@define-color foreground #dcd7ba;
-@define-color background #1f1f28;
diff --git a/themes/matte-black/alacritty.toml b/themes/matte-black/alacritty.toml
deleted file mode 100644
index 20824098..00000000
--- a/themes/matte-black/alacritty.toml
+++ /dev/null
@@ -1,53 +0,0 @@
-# ────────────────────────────────────────────────────────────
-# Omarchy Matte Black Theme for Alacritty
-# By tahayvr
-# https://github.com/tahayvr
-# ────────────────────────────────────────────────────────────
-
-[window]
-# window padding {px}
-padding.x = 12
-padding.y = 12
-
-[font]
-size = 12.0
-
-
-
-[colors]
-[colors.primary]
-background = "#121212"
-foreground = "#bebebe"
-dim_foreground = "#8a8a8d"
-
-[colors.cursor]
-text = "#121212"
-cursor = "#eaeaea"
-
-[colors.vi_mode_cursor]
-text = "#121212"
-cursor = "#eaeaea"
-
-[colors.selection]
-text = "CellForeground"
-background = "#333333"
-
-[colors.normal]
-black = "#333333"
-red = "#D35F5F"
-green = "#FFC107"
-yellow = "#b91c1c"
-blue = "#e68e0d"
-magenta = "#D35F5F"
-cyan = "#bebebe"
-white = "#bebebe"
-
-[colors.bright]
-black = "#8a8a8d"
-red = "#B91C1C"
-green = "#FFC107"
-yellow = "#b90a0a"
-blue = "#f59e0b"
-magenta = "#B91C1C"
-cyan = "#eaeaea"
-white = "#ffffff"
\ No newline at end of file
diff --git a/themes/matte-black/colors.toml b/themes/matte-black/colors.toml
new file mode 100644
index 00000000..badef1ab
--- /dev/null
+++ b/themes/matte-black/colors.toml
@@ -0,0 +1,26 @@
+accent = "#e68e0d"
+active_border_color = "#595959"
+active_tab_background = "#121212"
+
+cursor = "#eaeaea"
+foreground = "#bebebe"
+background = "#121212"
+selection_foreground = "#bebebe"
+selection_background = "#333333"
+
+color0 = "#333333"
+color1 = "#D35F5F"
+color2 = "#FFC107"
+color3 = "#b91c1c"
+color4 = "#e68e0d"
+color5 = "#D35F5F"
+color6 = "#bebebe"
+color7 = "#bebebe"
+color8 = "#8a8a8d"
+color9 = "#B91C1C"
+color10 = "#FFC107"
+color11 = "#b90a0a"
+color12 = "#f59e0b"
+color13 = "#B91C1C"
+color14 = "#eaeaea"
+color15 = "#ffffff"
diff --git a/themes/matte-black/ghostty.conf b/themes/matte-black/ghostty.conf
deleted file mode 100644
index 85c69b15..00000000
--- a/themes/matte-black/ghostty.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-background = #121212
-foreground = #BEBEBE
-
-cursor-color = #EAEAEA
-cursor-text = #121212
-
-selection-background = #333333
-selection-foreground = #EAEAEA
-
-# normal colors
-palette = 0=#333333
-palette = 1=#D35F5F
-palette = 2=#FFC107
-palette = 3=#B91C1C
-palette = 4=#E68E0D
-palette = 5=#D35F5F
-palette = 6=#BEBEBE
-palette = 7=#BEBEBE
-
-# bright colors
-palette = 8=#8A8A8D
-palette = 9=#B91C1C
-palette = 10=#FFC107
-palette = 11=#B90A0A
-palette = 12=#F59E0B
-palette = 13=#B91C1C
-palette = 14=#EAEAEA
-palette = 15=#FFFFFF
diff --git a/themes/matte-black/hyprland-preview-share-picker.css b/themes/matte-black/hyprland-preview-share-picker.css
deleted file mode 100644
index 783e7d72..00000000
--- a/themes/matte-black/hyprland-preview-share-picker.css
+++ /dev/null
@@ -1,94 +0,0 @@
-@define-color foreground #EAEAEA;
-@define-color background #121212;
-@define-color accent #B91C1C;
-@define-color muted #595959;
-@define-color card_bg #1e1e1e;
-@define-color text_dark #EAEAEA;
-@define-color accent_hover #D35F5F;
-@define-color selected_tab #B91C1C;
-@define-color text #EAEAEA;
-
-* {
-  all: unset;
-  font-family: JetBrains Mono NF;
-  color: @foreground;
-  font-weight: bold;
-  font-size: 16px;
-}
-
-.window {
-  background: alpha(@background, 0.95);
-  border: solid 2px @accent;
-  margin: 4px;
-  padding: 18px;
-}
-
-tabs {
-    padding: 0.5rem 1rem;
-}
-
-tabs > tab {
-    margin-right: 1rem;
-}
-
-.tab-label {
-    color: @text;
-    transition: all 0.2s ease;
-}
-
-tabs > tab:checked > .tab-label, tabs > tab:active > .tab-label {
-    text-decoration: underline currentColor;
-    color: @selected_tab;
-}
-
-tabs > tab:focus > .tab-label {
-    color: @foreground;
-}
-
-.page {
-    padding: 1rem;
-}
-
-.image-label {
-    font-size: 12px;
-    padding: 0.25rem;
-}
-
-flowboxchild > .card, button > .card {
-    transition: all 0.2s ease;
-    border: solid 2px transparent;
-    border-color: @background;
-    border-radius: 5px;
-    background-color: @card_bg;
-    padding: 5px;
-}
-
-flowboxchild:hover > .card, button:hover > .card, flowboxchild:active > .card, flowboxchild:selected > .card, button:active > .card, button:selected > .card, button:focus > .card {
-    border: solid 2px @accent;
-}
-
-.image {
-    border-radius: 5px;
-}
-
-.region-button {
-    padding: 0.5rem 1rem;
-    border-radius: 5px;
-    background-color: @accent;
-    color: @text_dark;
-    transition: all 0.2s ease;
-}
-
-.region-button > label {
-    color: @text_dark;
-}
-
-.region-button:not(:disabled):hover, .region-button:not(:disabled):focus {
-    background-color: @accent_hover;
-    color: @text_dark;
-}
-
-.region-button:disabled {
-    background-color: @muted;
-    color: @background;
-}
diff --git a/themes/matte-black/hyprland.conf b/themes/matte-black/hyprland.conf
deleted file mode 100644
index 4fd7ff60..00000000
--- a/themes/matte-black/hyprland.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-$activeBorderColor = rgb(8A8A8D)
-
-general {
-    col.active_border = $activeBorderColor
-}
-
-group {
-    col.border_active = $activeBorderColor
-}
diff --git a/themes/matte-black/hyprlock.conf b/themes/matte-black/hyprlock.conf
deleted file mode 100644
index 54f49479..00000000
--- a/themes/matte-black/hyprlock.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-$color = rgba(12,12,12,1.0)
-$inner_color = rgba(138,138,141,0.3)
-$outer_color = rgba(234,234,234,0.5)
-$font_color = rgba(234,234,234,1.0)
-$check_color = rgba(245,158,11,1.0)
diff --git a/themes/matte-black/kitty.conf b/themes/matte-black/kitty.conf
deleted file mode 100644
index b5ee1da1..00000000
--- a/themes/matte-black/kitty.conf
+++ /dev/null
@@ -1,54 +0,0 @@
-## name:  Matte Black
-
-foreground              #bebebe
-background              #121212
-selection_foreground    #121212
-selection_background    #333333
-
-cursor                  #eaeaea
-cursor_text_color       #121212
-
-# URL underline color when hovering with mouse
-url_color               #bebebe
-
-# Kitty window border colors
-active_border_color     #595959
-inactive_border_color   #595959
-bell_border_color       #595959
-
-# OS Window titlebar colors
-wayland_titlebar_color  system
-macos_titlebar_color    system
-
-# Tab bar colors
-active_tab_foreground   #bebebe
-active_tab_background   #121212
-inactive_tab_foreground #bebebe
-inactive_tab_background #121212
-tab_bar_background      #bebebe
-
-# Colors for marks (marked text in the terminal)
-mark1_foreground        #121212
-mark1_background        #404040
-mark2_foreground        #121212
-mark2_background        #121212
-mark3_foreground        #121212
-mark3_background        #a6a6a6
-
-color0  #333333
-color8  #8a8a8d
-color1  #D35F5F
-color9  #B91C1C
-color2  #FFC107
-color10 #FFC107
-color3  #b91c1c
-color11 #b90a0a
-color4  #e68e0d
-color12 #f59e0b
-color5  #D35F5F
-color13 #B91C1C
-color6  #bebebe
-color14 #eaeaea
-color7  #bebebe
-color15 #ffffff
-
diff --git a/themes/matte-black/mako.ini b/themes/matte-black/mako.ini
deleted file mode 100644
index 0515363c..00000000
--- a/themes/matte-black/mako.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-include=~/.local/share/omarchy/default/mako/core.ini
-
-text-color=#8a8a8d
-border-color=#8A8A8D
-background-color=#1e1e1e
diff --git a/themes/matte-black/swayosd.css b/themes/matte-black/swayosd.css
deleted file mode 100644
index b00ea2f5..00000000
--- a/themes/matte-black/swayosd.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@define-color background-color #121212;
-@define-color border-color #CCCCCC;
-@define-color label #CCCCCC;
-@define-color image #CCCCCC;
-@define-color progress #CCCCCC;
-
diff --git a/themes/matte-black/walker.css b/themes/matte-black/walker.css
deleted file mode 100644
index d3d606bc..00000000
--- a/themes/matte-black/walker.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@define-color selected-text #B91C1C;
-@define-color text #EAEAEA;
-@define-color base #121212;
-@define-color border #EAEAEA88;
-@define-color foreground #EAEAEA;
-@define-color background #121212;
diff --git a/themes/matte-black/waybar.css b/themes/matte-black/waybar.css
deleted file mode 100644
index 1b8bb7f2..00000000
--- a/themes/matte-black/waybar.css
+++ /dev/null
@@ -1,2 +0,0 @@
-@define-color foreground #8a8a8d;
-@define-color background #1e1e1e;
diff --git a/themes/nord/alacritty.toml b/themes/nord/alacritty.toml
deleted file mode 100644
index 4a087891..00000000
--- a/themes/nord/alacritty.toml
+++ /dev/null
@@ -1,47 +0,0 @@
-[colors]
-[colors.primary]
-background = "#2e3440"
-foreground = "#d8dee9"
-dim_foreground = "#a5abb6"
-
-[colors.cursor]
-text = "#2e3440"
-cursor = "#d8dee9"
-
-[colors.vi_mode_cursor]
-text = "#2e3440"
-cursor = "#d8dee9"
-
-[colors.selection]
-text = "CellForeground"
-background = "#4c566a"
-
-[colors.normal]
-black = "#3b4252"
-red = "#bf616a"
-green = "#a3be8c"
-yellow = "#ebcb8b"
-blue = "#81a1c1"
-magenta = "#b48ead"
-cyan = "#88c0d0"
-white = "#e5e9f0"
-
-[colors.bright]
-black = "#4c566a"
-red = "#bf616a"
-green = "#a3be8c"
-yellow = "#ebcb8b"
-blue = "#81a1c1"
-magenta = "#b48ead"
-cyan = "#8fbcbb"
-white = "#eceff4"
-
-[colors.dim]
-black = "#373e4d"
-red = "#94545d"
-green = "#809575"
-yellow = "#b29e75"
-blue = "#68809a"
-magenta = "#8c738c"
-cyan = "#6d96a5"
-white = "#aeb3bb"
diff --git a/themes/nord/colors.toml b/themes/nord/colors.toml
new file mode 100644
index 00000000..9ff8d33d
--- /dev/null
+++ b/themes/nord/colors.toml
@@ -0,0 +1,26 @@
+accent = "#81a1c1"
+active_border_color = "#81A1C1"
+active_tab_background = "#2E3440"
+
+cursor = "#d8dee9"
+foreground = "#d8dee9"
+background = "#2e3440"
+selection_foreground = "#d8dee9"
+selection_background = "#4c566a"
+
+color0 = "#3b4252"
+color1 = "#bf616a"
+color2 = "#a3be8c"
+color3 = "#ebcb8b"
+color4 = "#81a1c1"
+color5 = "#b48ead"
+color6 = "#88c0d0"
+color7 = "#e5e9f0"
+color8 = "#4c566a"
+color9 = "#bf616a"
+color10 = "#a3be8c"
+color11 = "#ebcb8b"
+color12 = "#81a1c1"
+color13 = "#b48ead"
+color14 = "#8fbcbb"
+color15 = "#eceff4"
diff --git a/themes/nord/ghostty.conf b/themes/nord/ghostty.conf
deleted file mode 100644
index a93dbc9e..00000000
--- a/themes/nord/ghostty.conf
+++ /dev/null
@@ -1 +0,0 @@
-theme = Nord
diff --git a/themes/nord/hyprland-preview-share-picker.css b/themes/nord/hyprland-preview-share-picker.css
deleted file mode 100644
index 07de41cb..00000000
--- a/themes/nord/hyprland-preview-share-picker.css
+++ /dev/null
@@ -1,94 +0,0 @@
-@define-color foreground #D8DEE9;
-@define-color background #2E3440;
-@define-color accent #88C0D0;
-@define-color muted #4C566A;
-@define-color card_bg #3B4252;
-@define-color text_dark #2E3440;
-@define-color accent_hover #8FBCBB;
-@define-color selected_tab #88C0D0;
-@define-color text #D8DEE9;
-
-* {
-  all: unset;
-  font-family: JetBrains Mono NF;
-  color: @foreground;
-  font-weight: bold;
-  font-size: 16px;
-}
-
-.window {
-  background: alpha(@background, 0.95);
-  border: solid 2px @accent;
-  margin: 4px;
-  padding: 18px;
-}
-
-tabs {
-    padding: 0.5rem 1rem;
-}
-
-tabs > tab {
-    margin-right: 1rem;
-}
-
-.tab-label {
-    color: @text;
-    transition: all 0.2s ease;
-}
-
-tabs > tab:checked > .tab-label, tabs > tab:active > .tab-label {
-    text-decoration: underline currentColor;
-    color: @selected_tab;
-}
-
-tabs > tab:focus > .tab-label {
-    color: @foreground;
-}
-
-.page {
-    padding: 1rem;
-}
-
-.image-label {
-    font-size: 12px;
-    padding: 0.25rem;
-}
-
-flowboxchild > .card, button > .card {
-    transition: all 0.2s ease;
-    border: solid 2px transparent;
-    border-color: @background;
-    border-radius: 5px;
-    background-color: @card_bg;
-    padding: 5px;
-}
-
-flowboxchild:hover > .card, button:hover > .card, flowboxchild:active > .card, flowboxchild:selected > .card, button:active > .card, button:selected > .card, button:focus > .card {
-    border: solid 2px @accent;
-}
-
-.image {
-    border-radius: 5px;
-}
-
-.region-button {
-    padding: 0.5rem 1rem;
-    border-radius: 5px;
-    background-color: @accent;
-    color: @text_dark;
-    transition: all 0.2s ease;
-}
-
-.region-button > label {
-    color: @text_dark;
-}
-
-.region-button:not(:disabled):hover, .region-button:not(:disabled):focus {
-    background-color: @accent_hover;
-    color: @text_dark;
-}
-
-.region-button:disabled {
-    background-color: @muted;
-    color: @background;
-}
diff --git a/themes/nord/hyprland.conf b/themes/nord/hyprland.conf
deleted file mode 100644
index ac91e8bb..00000000
--- a/themes/nord/hyprland.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-$activeBorderColor = rgb(D8DEE9)
-
-general {
-    col.active_border = $activeBorderColor
-}
-
-group {
-    col.border_active = $activeBorderColor
-}
diff --git a/themes/nord/hyprlock.conf b/themes/nord/hyprlock.conf
deleted file mode 100644
index 7726df47..00000000
--- a/themes/nord/hyprlock.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-$color = rgba(46,52,64,1.0)
-$inner_color = rgba(46,52,64,0.8)
-$outer_color = rgba(216,222,233,1.0)
-$font_color = rgba(216,222,233,1.0)
-$check_color = rgba(136, 192, 208, 1.0)
diff --git a/themes/nord/kitty.conf b/themes/nord/kitty.conf
deleted file mode 100644
index 91b570ff..00000000
--- a/themes/nord/kitty.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-# Nord Colorscheme for Kitty
-
-foreground            #D8DEE9
-background            #2E3440
-selection_foreground  #000000
-selection_background  #FFFACD
-url_color             #0087BD
-cursor                #81A1C1
-
-# black
-color0   #3B4252
-color8   #4C566A
-
-# red
-color1   #BF616A
-color9   #BF616A
-
-# green
-color2   #A3BE8C
-color10  #A3BE8C
-
-# yellow
-color3   #EBCB8B
-color11  #EBCB8B
-
-# blue
-color4  #81A1C1
-color12 #81A1C1
-
-# magenta
-color5   #B48EAD
-color13  #B48EAD
-
-# cyan
-color6   #88C0D0
-color14  #8FBCBB
-
-# white
-color7   #E5E9F0
-color15  #ECEFF4
diff --git a/themes/nord/mako.ini b/themes/nord/mako.ini
deleted file mode 100644
index 5eaadd9a..00000000
--- a/themes/nord/mako.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-include=~/.local/share/omarchy/default/mako/core.ini
-
-text-color=#d8dee9
-border-color=#D8DEE9
-background-color=#2e3440
diff --git a/themes/nord/swayosd.css b/themes/nord/swayosd.css
deleted file mode 100644
index db1b40d8..00000000
--- a/themes/nord/swayosd.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@define-color background-color #2E3440;
-@define-color border-color #D8DEE9;
-@define-color label #D8DEE9;
-@define-color image #D8DEE9;
-@define-color progress #D8DEE9;
-
diff --git a/themes/nord/walker.css b/themes/nord/walker.css
deleted file mode 100644
index 2e20d172..00000000
--- a/themes/nord/walker.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@define-color selected-text #88C0D0;
-@define-color text #D8DEE9;
-@define-color base #2E3440;
-@define-color border #D8DEE9;
-@define-color foreground #D8DEE9;
-@define-color background #2E3440;
diff --git a/themes/nord/waybar.css b/themes/nord/waybar.css
deleted file mode 100644
index bc2a99d4..00000000
--- a/themes/nord/waybar.css
+++ /dev/null
@@ -1,2 +0,0 @@
-@define-color foreground #d8dee9;
-@define-color background #2e3440;
diff --git a/themes/osaka-jade/alacritty.toml b/themes/osaka-jade/alacritty.toml
deleted file mode 100644
index 3cb8513a..00000000
--- a/themes/osaka-jade/alacritty.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-[colors]
-[colors.primary]
-background = '#111c18'
-foreground = '#C1C497'
-
-[colors.normal]
-black   = "#23372B"
-red     = "#FF5345"
-green   = "#549e6a"
-yellow  = "#459451"
-blue    = "#509475"
-magenta = "#D2689C"
-cyan    = "#2DD5B7"
-white   = "#F6F5DD"
-
-[colors.bright]
-black   = "#53685B"
-red     = "#db9f9c"
-green   = "#63b07a"
-yellow  = "#E5C736"
-blue    = "#ACD4CF"
-magenta = "#75bbb3"
-cyan    = "#8CD3CB"
-white   = "#9eebb3"
-
-[colors.cursor]
-text   = "#000000"
-cursor = "#D7C995"
diff --git a/themes/osaka-jade/colors.toml b/themes/osaka-jade/colors.toml
new file mode 100644
index 00000000..a93532dc
--- /dev/null
+++ b/themes/osaka-jade/colors.toml
@@ -0,0 +1,26 @@
+accent = "#509475"
+active_border_color = "#509475"
+active_tab_background = "#C1C497"
+
+cursor = "#D7C995"
+foreground = "#C1C497"
+background = "#111c18"
+selection_foreground = "#111C18"
+selection_background = "#C1C497"
+
+color0 = "#23372B"
+color1 = "#FF5345"
+color2 = "#549e6a"
+color3 = "#459451"
+color4 = "#509475"
+color5 = "#D2689C"
+color6 = "#2DD5B7"
+color7 = "#F6F5DD"
+color8 = "#53685B"
+color9 = "#db9f9c"
+color10 = "#63b07a"
+color11 = "#E5C736"
+color12 = "#ACD4CF"
+color13 = "#75bbb3"
+color14 = "#8CD3CB"
+color15 = "#9eebb3"
diff --git a/themes/osaka-jade/ghostty.conf b/themes/osaka-jade/ghostty.conf
deleted file mode 100644
index 75eb6685..00000000
--- a/themes/osaka-jade/ghostty.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# primary
-background = #111c18
-foreground = #C1C497
-cursor-color = #D7C995
-cursor-text = #000000
-
-# normal colors
-palette = 0=#23372B
-palette = 1=#FF5345
-palette = 2=#549e6a
-palette = 3=#459451
-palette = 4=#509475
-palette = 5=#D2689C
-palette = 6=#2DD5B7
-palette = 7=#F6F5DD
-
-# bright colors
-palette = 8=#53685B
-palette = 9=#db9f9c
-palette = 10=#63b07a
-palette = 11=#E5C736
-palette = 12=#ACD4CF
-palette = 13=#75bbb3
-palette = 14=#8CD3CB
-palette = 15=#9eebb3
diff --git a/themes/osaka-jade/hyprland-preview-share-picker.css b/themes/osaka-jade/hyprland-preview-share-picker.css
deleted file mode 100644
index faa50012..00000000
--- a/themes/osaka-jade/hyprland-preview-share-picker.css
+++ /dev/null
@@ -1,94 +0,0 @@
-@define-color foreground #ebfff2;
-@define-color background #11221C;
-@define-color accent #2DD5B7;
-@define-color muted #53685B;
-@define-color card_bg #23372B;
-@define-color text_dark #11221C;
-@define-color accent_hover #8CD3CB;
-@define-color selected_tab #2DD5B7;
-@define-color text #ebfff2;
-
-* {
-  all: unset;
-  font-family: JetBrains Mono NF;
-  color: @foreground;
-  font-weight: bold;
-  font-size: 16px;
-}
-
-.window {
-  background: alpha(@background, 0.95);
-  border: solid 2px @accent;
-  margin: 4px;
-  padding: 18px;
-}
-
-tabs {
-    padding: 0.5rem 1rem;
-}
-
-tabs > tab {
-    margin-right: 1rem;
-}
-
-.tab-label {
-    color: @text;
-    transition: all 0.2s ease;
-}
-
-tabs > tab:checked > .tab-label, tabs > tab:active > .tab-label {
-    text-decoration: underline currentColor;
-    color: @selected_tab;
-}
-
-tabs > tab:focus > .tab-label {
-    color: @foreground;
-}
-
-.page {
-    padding: 1rem;
-}
-
-.image-label {
-    font-size: 12px;
-    padding: 0.25rem;
-}
-
-flowboxchild > .card, button > .card {
-    transition: all 0.2s ease;
-    border: solid 2px transparent;
-    border-color: @background;
-    border-radius: 5px;
-    background-color: @card_bg;
-    padding: 5px;
-}
-
-flowboxchild:hover > .card, button:hover > .card, flowboxchild:active > .card, flowboxchild:selected > .card, button:active > .card, button:selected > .card, button:focus > .card {
-    border: solid 2px @accent;
-}
-
-.image {
-    border-radius: 5px;
-}
-
-.region-button {
-    padding: 0.5rem 1rem;
-    border-radius: 5px;
-    background-color: @accent;
-    color: @text_dark;
-    transition: all 0.2s ease;
-}
-
-.region-button > label {
-    color: @text_dark;
-}
-
-.region-button:not(:disabled):hover, .region-button:not(:disabled):focus {
-    background-color: @accent_hover;
-    color: @text_dark;
-}
-
-.region-button:disabled {
-    background-color: @muted;
-    color: @background;
-}
diff --git a/themes/osaka-jade/hyprland.conf b/themes/osaka-jade/hyprland.conf
deleted file mode 100644
index fd7c0363..00000000
--- a/themes/osaka-jade/hyprland.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-$activeBorderColor = rgb(71CEAD)
-
-general {
-    col.active_border = $activeBorderColor
-}
-
-group {
-    col.border_active = $activeBorderColor
-}
diff --git a/themes/osaka-jade/hyprlock.conf b/themes/osaka-jade/hyprlock.conf
deleted file mode 100644
index 885b89d0..00000000
--- a/themes/osaka-jade/hyprlock.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-$color = rgb(7, 40, 32)
-$inner_color = rgb(7, 40, 32)
-$outer_color = rgb(167, 172, 132)
-$font_color = rgb(167, 172, 132)
-$check_color = rgb(131, 162, 152)
diff --git a/themes/osaka-jade/kitty.conf b/themes/osaka-jade/kitty.conf
deleted file mode 100644
index cd6c84e5..00000000
--- a/themes/osaka-jade/kitty.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-## name :osaka-jade
-foreground              #C1C497
-background              #111C18
-selection_foreground    #111C18
-selection_background    #C1C497
-cursor                  #D7C995
-cursor_text_color       #000000
-active_tab_foreground   #111C18
-active_tab_background   #C1C497
-inactive_tab_foreground #C1C497
-inactive_tab_background #111C18
-
-# black
-color0  #23372B
-color8  #53685B
-
-# red
-color1  #FF5345
-color9  #DB9F9C
-
-# green
-color2  #549E6A
-color10 #63b07a
-
-# yellow
-color3  #459451
-color11 #E5C736
-
-# blue
-color4  #509475
-color12 #ACD4CF
-
-# magenta
-color5  #D2689C
-color13 #75BBB3
-
-# cyan
-color6  #2DD5B7
-color14 #8CD3CB
-
-# white
-color7  #F6F5DD
-color15 #9EEBB3
-
diff --git a/themes/osaka-jade/mako.ini b/themes/osaka-jade/mako.ini
deleted file mode 100644
index 22fe2aae..00000000
--- a/themes/osaka-jade/mako.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-include=~/.local/share/omarchy/default/mako/core.ini
-
-text-color=#C1C497
-border-color=#214237
-background-color=#11221C
diff --git a/themes/osaka-jade/swayosd.css b/themes/osaka-jade/swayosd.css
deleted file mode 100644
index 1558ad4d..00000000
--- a/themes/osaka-jade/swayosd.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@define-color background-color #11221C;
-@define-color border-color #589A5F;
-@define-color label #C0C396;
-@define-color image #C0C396;
-@define-color progress #C0C396;
diff --git a/themes/osaka-jade/walker.css b/themes/osaka-jade/walker.css
deleted file mode 100644
index ff99bbb9..00000000
--- a/themes/osaka-jade/walker.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@define-color selected-text #e1b55e;
-@define-color text #ebfff2;
-@define-color base #11221C;
-@define-color border #214237;
-@define-color foreground #11221C;
-@define-color background #11221C;
diff --git a/themes/osaka-jade/waybar.css b/themes/osaka-jade/waybar.css
deleted file mode 100644
index 7cfd5372..00000000
--- a/themes/osaka-jade/waybar.css
+++ /dev/null
@@ -1,2 +0,0 @@
-@define-color foreground #e6d8ba;
-@define-color background #11221C;
diff --git a/themes/ristretto/alacritty.toml b/themes/ristretto/alacritty.toml
deleted file mode 100644
index 45236efd..00000000
--- a/themes/ristretto/alacritty.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-[colors]
-
-[colors.normal]
-black   = "#72696a"
-red = "#fd6883"
-green = "#adda78"
-yellow = "#f9cc6c"
-blue = "#f38d70"
-magenta = "#a8a9eb"
-cyan = "#85dacc"
-white = "#e6d9db"
-
-[colors.bright]
-black = "#948a8b"
-red     = "#ff8297"
-green   = "#c8e292"
-yellow  = "#fcd675"
-blue    = "#f8a788"
-magenta = "#bebffd"
-cyan    = "#9bf1e1"
-white   = "#f1e5e7"
-
-[colors.cursor]
-cursor = '#c3b7b8'
-text = '#2c2525'
-
-[colors.primary]
-background = '#2c2525'
-foreground = '#e6d9db'
-
-[colors.selection]
-background = '#403e41'
-text = '#e6d9db'
diff --git a/themes/ristretto/colors.toml b/themes/ristretto/colors.toml
new file mode 100644
index 00000000..948c4d39
--- /dev/null
+++ b/themes/ristretto/colors.toml
@@ -0,0 +1,26 @@
+accent = "#f38d70"
+active_border_color = "#e6d9db"
+active_tab_background = "#f9cc6c"
+
+cursor = "#c3b7b8"
+foreground = "#e6d9db"
+background = "#2c2525"
+selection_foreground = "#e6d9db"
+selection_background = "#403e41"
+
+color0 = "#72696a"
+color1 = "#fd6883"
+color2 = "#adda78"
+color3 = "#f9cc6c"
+color4 = "#f38d70"
+color5 = "#a8a9eb"
+color6 = "#85dacc"
+color7 = "#e6d9db"
+color8 = "#948a8b"
+color9 = "#ff8297"
+color10 = "#c8e292"
+color11 = "#fcd675"
+color12 = "#f8a788"
+color13 = "#bebffd"
+color14 = "#9bf1e1"
+color15 = "#f1e5e7"
diff --git a/themes/ristretto/ghostty.conf b/themes/ristretto/ghostty.conf
deleted file mode 100644
index 94a80fcb..00000000
--- a/themes/ristretto/ghostty.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-theme = Monokai Pro Ristretto
-cursor-text = #000000
diff --git a/themes/ristretto/hyprland-preview-share-picker.css b/themes/ristretto/hyprland-preview-share-picker.css
deleted file mode 100644
index 056861af..00000000
--- a/themes/ristretto/hyprland-preview-share-picker.css
+++ /dev/null
@@ -1,94 +0,0 @@
-@define-color foreground #e6d9db;
-@define-color background #2c2525;
-@define-color accent #f9cc6c;
-@define-color muted #948a8b;
-@define-color card_bg #403e41;
-@define-color text_dark #2c2525;
-@define-color accent_hover #fcd675;
-@define-color selected_tab #f9cc6c;
-@define-color text #e6d9db;
-
-* {
-  all: unset;
-  font-family: JetBrains Mono NF;
-  color: @foreground;
-  font-weight: bold;
-  font-size: 16px;
-}
-
-.window {
-  background: alpha(@background, 0.95);
-  border: solid 2px @accent;
-  margin: 4px;
-  padding: 18px;
-}
-
-tabs {
-    padding: 0.5rem 1rem;
-}
-
-tabs > tab {
-    margin-right: 1rem;
-}
-
-.tab-label {
-    color: @text;
-    transition: all 0.2s ease;
-}
-
-tabs > tab:checked > .tab-label, tabs > tab:active > .tab-label {
-    text-decoration: underline currentColor;
-    color: @selected_tab;
-}
-
-tabs > tab:focus > .tab-label {
-    color: @foreground;
-}
-
-.page {
-    padding: 1rem;
-}
-
-.image-label {
-    font-size: 12px;
-    padding: 0.25rem;
-}
-
-flowboxchild > .card, button > .card {
-    transition: all 0.2s ease;
-    border: solid 2px transparent;
-    border-color: @background;
-    border-radius: 5px;
-    background-color: @card_bg;
-    padding: 5px;
-}
-
-flowboxchild:hover > .card, button:hover > .card, flowboxchild:active > .card, flowboxchild:selected > .card, button:active > .card, button:selected > .card, button:focus > .card {
-    border: solid 2px @accent;
-}
-
-.image {
-    border-radius: 5px;
-}
-
-.region-button {
-    padding: 0.5rem 1rem;
-    border-radius: 5px;
-    background-color: @accent;
-    color: @text_dark;
-    transition: all 0.2s ease;
-}
-
-.region-button > label {
-    color: @text_dark;
-}
-
-.region-button:not(:disabled):hover, .region-button:not(:disabled):focus {
-    background-color: @accent_hover;
-    color: @text_dark;
-}
-
-.region-button:disabled {
-    background-color: @muted;
-    color: @background;
-}
diff --git a/themes/ristretto/hyprland.conf b/themes/ristretto/hyprland.conf
deleted file mode 100644
index d8ffcdb9..00000000
--- a/themes/ristretto/hyprland.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-$activeBorderColor = rgb(e6d9db)
-
-general {
-    col.active_border = $activeBorderColor
-}
-
-group {
-    col.border_active = $activeBorderColor
-}
diff --git a/themes/ristretto/hyprlock.conf b/themes/ristretto/hyprlock.conf
deleted file mode 100644
index 71c8b78a..00000000
--- a/themes/ristretto/hyprlock.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-$color = rgba(44,37,37,1.0)
-$inner_color = rgba(44,37,37,0.8)
-$outer_color = rgba(230,217,219,1.0)
-$font_color = rgba(230,217,219,1.0)
-$check_color = rgba(253,104,131,1.0)
diff --git a/themes/ristretto/kitty.conf b/themes/ristretto/kitty.conf
deleted file mode 100644
index 7640e7cc..00000000
--- a/themes/ristretto/kitty.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-## name : Ristretto
-
-foreground              #e6d9db
-background              #2c2525
-
-selection_foreground    #e6d9db
-selection_background    #403e41
-
-cursor                  #c3b7b8
-cursor_text_color       #c3b7b8
-
-url_color               #e6d9db
-
-active_border_color     #e6d9db
-inactive_border_color   #595959
-bell_border_color       #595959
-
-active_tab_foreground   #2c2525
-active_tab_background   #f9cc6c
-inactive_tab_foreground #e6d9db
-inactive_tab_background #2c2525
-tab_bar_background      #404040
-
-mark1_foreground        #2c2525
-mark1_background        #404040
-mark2_foreground        #2c2525
-mark2_background        #2c2525
-mark3_foreground        #2c2525
-mark3_background        #a6a6a6
-
-color0  #72696a
-color8  #948a8b
-
-color1  #fd6883
-color9  #ff8297
-
-color2  #adda78
-color10 #c8e292
-
-color3  #f9cc6c
-color11 #fcd675
-
-color4  #f38d70
-color12 #f8a788
-
-color5  #a8a9eb
-color13 #bebffd
-
-color6  #85dacc
-color14 #9bf1e1
-
-color7  #e6d9db
-color15  #f1e5e7
diff --git a/themes/ristretto/mako.ini b/themes/ristretto/mako.ini
deleted file mode 100644
index 732a96df..00000000
--- a/themes/ristretto/mako.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-include=~/.local/share/omarchy/default/mako/core.ini
-
-text-color=#e6d9db
-border-color=#e6d9db
-background-color=#2c2525
diff --git a/themes/ristretto/swayosd.css b/themes/ristretto/swayosd.css
deleted file mode 100644
index cd9c5765..00000000
--- a/themes/ristretto/swayosd.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@define-color background-color #2c2525;
-@define-color border-color #c3b7b8;
-@define-color label #c3b7b8;
-@define-color image #c3b7b8;
-@define-color progress #c3b7b8;
diff --git a/themes/ristretto/walker.css b/themes/ristretto/walker.css
deleted file mode 100644
index ab2cfd84..00000000
--- a/themes/ristretto/walker.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@define-color selected-text #fabd2f;
-@define-color text #e6d9db;
-@define-color base #2c2525;
-@define-color border #e6d9db;
-@define-color foreground #e6d9db;
-@define-color background #2c2525;
diff --git a/themes/ristretto/waybar.css b/themes/ristretto/waybar.css
deleted file mode 100644
index a6be70ac..00000000
--- a/themes/ristretto/waybar.css
+++ /dev/null
@@ -1,2 +0,0 @@
-@define-color foreground #e6d9db;
-@define-color background #2c2525;
diff --git a/themes/rose-pine/alacritty.toml b/themes/rose-pine/alacritty.toml
deleted file mode 100644
index 947e42da..00000000
--- a/themes/rose-pine/alacritty.toml
+++ /dev/null
@@ -1,72 +0,0 @@
-[colors.primary]
-foreground = "#575279"
-background = "#faf4ed"
-dim_foreground = "#797593"
-bright_foreground = "#575279"
-
-[colors.cursor]
-text = "#575279"
-cursor = "#cecacd"
-
-[colors.vi_mode_cursor]
-text = "#575279"
-cursor = "#cecacd"
-
-[colors.search.matches]
-foreground = "#797593"
-background = "#f2e9e1"
-
-[colors.search.focused_match]
-foreground = "#faf4ed"
-background = "#d7827e"
-
-[colors.hints.start]
-foreground = "#797593"
-background = "#fffaf3"
-
-[colors.hints.end]
-foreground = "#9893a5"
-background = "#fffaf3"
-
-[colors.line_indicator]
-foreground = "None"
-background = "None"
-
-[colors.footer_bar]
-foreground = "#575279"
-background = "#fffaf3"
-
-[colors.selection]
-text = "#575279"
-background = "#dfdad9"
-
-[colors.normal]
-black = "#f2e9e1"
-red = "#b4637a"
-green = "#286983"
-yellow = "#ea9d34"
-blue = "#56949f"
-magenta = "#907aa9"
-cyan = "#d7827e"
-white = "#575279"
-
-[colors.bright]
-black = "#9893a5"
-red = "#b4637a"
-green = "#286983"
-yellow = "#ea9d34"
-blue = "#56949f"
-magenta = "#907aa9"
-cyan = "#d7827e"
-white = "#575279"
-
-[colors.dim]
-black = "#9893a5"
-red = "#b4637a"
-green = "#286983"
-yellow = "#ea9d34"
-blue = "#56949f"
-magenta = "#907aa9"
-cyan = "#d7827e"
-white = "#575279"
-
diff --git a/themes/rose-pine/colors.toml b/themes/rose-pine/colors.toml
new file mode 100644
index 00000000..1321c13d
--- /dev/null
+++ b/themes/rose-pine/colors.toml
@@ -0,0 +1,26 @@
+accent = "#56949f"
+active_border_color = "#595959"
+active_tab_background = "#fffaf3"
+
+cursor = "#cecacd"
+foreground = "#575279"
+background = "#faf4ed"
+selection_foreground = "#575279"
+selection_background = "#dfdad9"
+
+color0 = "#f2e9e1"
+color1 = "#b4637a"
+color2 = "#286983"
+color3 = "#ea9d34"
+color4 = "#56949f"
+color5 = "#907aa9"
+color6 = "#d7827e"
+color7 = "#575279"
+color8 = "#9893a5"
+color9 = "#b4637a"
+color10 = "#286983"
+color11 = "#ea9d34"
+color12 = "#56949f"
+color13 = "#907aa9"
+color14 = "#d7827e"
+color15 = "#575279"
diff --git a/themes/rose-pine/ghostty.conf b/themes/rose-pine/ghostty.conf
deleted file mode 100644
index 33bbaa74..00000000
--- a/themes/rose-pine/ghostty.conf
+++ /dev/null
@@ -1 +0,0 @@
-theme = Rose Pine Dawn
diff --git a/themes/rose-pine/hyprland-preview-share-picker.css b/themes/rose-pine/hyprland-preview-share-picker.css
deleted file mode 100644
index 87ea9a56..00000000
--- a/themes/rose-pine/hyprland-preview-share-picker.css
+++ /dev/null
@@ -1,94 +0,0 @@
-@define-color foreground #575279;
-@define-color background #faf4ed;
-@define-color accent #d7827e;
-@define-color muted #9893a5;
-@define-color card_bg #fffaf3;
-@define-color text_dark #faf4ed;
-@define-color accent_hover #b4637a;
-@define-color selected_tab #d7827e;
-@define-color text #575279;
-
-* {
-  all: unset;
-  font-family: JetBrains Mono NF;
-  color: @foreground;
-  font-weight: bold;
-  font-size: 16px;
-}
-
-.window {
-  background: alpha(@background, 0.95);
-  border: solid 2px @accent;
-  margin: 4px;
-  padding: 18px;
-}
-
-tabs {
-    padding: 0.5rem 1rem;
-}
-
-tabs > tab {
-    margin-right: 1rem;
-}
-
-.tab-label {
-    color: @text;
-    transition: all 0.2s ease;
-}
-
-tabs > tab:checked > .tab-label, tabs > tab:active > .tab-label {
-    text-decoration: underline currentColor;
-    color: @selected_tab;
-}
-
-tabs > tab:focus > .tab-label {
-    color: @foreground;
-}
-
-.page {
-    padding: 1rem;
-}
-
-.image-label {
-    font-size: 12px;
-    padding: 0.25rem;
-}
-
-flowboxchild > .card, button > .card {
-    transition: all 0.2s ease;
-    border: solid 2px transparent;
-    border-color: @background;
-    border-radius: 5px;
-    background-color: @card_bg;
-    padding: 5px;
-}
-
-flowboxchild:hover > .card, button:hover > .card, flowboxchild:active > .card, flowboxchild:selected > .card, button:active > .card, button:selected > .card, button:focus > .card {
-    border: solid 2px @accent;
-}
-
-.image {
-    border-radius: 5px;
-}
-
-.region-button {
-    padding: 0.5rem 1rem;
-    border-radius: 5px;
-    background-color: @accent;
-    color: @text_dark;
-    transition: all 0.2s ease;
-}
-
-.region-button > label {
-    color: @text_dark;
-}
-
-.region-button:not(:disabled):hover, .region-button:not(:disabled):focus {
-    background-color: @accent_hover;
-    color: @text_dark;
-}
-
-.region-button:disabled {
-    background-color: @muted;
-    color: @background;
-}
diff --git a/themes/rose-pine/hyprland.conf b/themes/rose-pine/hyprland.conf
deleted file mode 100644
index 34d47643..00000000
--- a/themes/rose-pine/hyprland.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-$activeBorderColor = rgb(575279)
-
-general {
-    col.active_border = $activeBorderColor
-}
-
-group {
-    col.border_active = $activeBorderColor
-}
diff --git a/themes/rose-pine/hyprlock.conf b/themes/rose-pine/hyprlock.conf
deleted file mode 100644
index 890e7e5f..00000000
--- a/themes/rose-pine/hyprlock.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-$color = rgba(250, 244, 237,1.0)
-$inner_color = rgba(250, 244, 237,0.8)
-$outer_color = rgba(57,52,79,1.0)
-$font_color = rgba(57,52,79,1.0)
-$check_color = rgba(136, 192, 208, 1.0)
diff --git a/themes/rose-pine/kitty.conf b/themes/rose-pine/kitty.conf
deleted file mode 100644
index 6c021dca..00000000
--- a/themes/rose-pine/kitty.conf
+++ /dev/null
@@ -1,51 +0,0 @@
-## name: Rose-Pine
-
-foreground              #575279
-background              #faf4ed
-
-selection_foreground    #575279
-selection_background    #dfdad9
-
-cursor                  #cecacd
-cursor_text_color       #575279
-
-url_color               #575279
-
-active_border_color     #595959
-inactive_border_color   #595959
-bell_border_color       #595959
-
-active_tab_foreground   #575279
-active_tab_background   #fffaf3
-inactive_tab_foreground #575279
-inactive_tab_background #fffaf3
-tab_bar_background      #575279
-
-mark1_foreground        #faf4ed
-mark1_background        #fffaf3
-mark2_foreground        #9893a5
-mark2_background        #fffaf3
-
-color0  #f2e9e1
-color8  #9893a5
-
-color1  #b4637a
-color9  #b4637a
-
-color2  #286983
-color10 #286983
-
-color3  #ea9d34
-color11 #ea9d34
-
-color4  #56949f
-color12 #56949f
-
-color5  #907aa9
-color13 #907aa9
-
-color6  #d7827e
-color14 #d7827e
-
-color7  #575279
-color15  #575279
diff --git a/themes/rose-pine/mako.ini b/themes/rose-pine/mako.ini
deleted file mode 100644
index f2284fc8..00000000
--- a/themes/rose-pine/mako.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-include=~/.local/share/omarchy/default/mako/core.ini
-
-text-color=#575279
-border-color=#575279
-background-color=#faf4ed
diff --git a/themes/rose-pine/swayosd.css b/themes/rose-pine/swayosd.css
deleted file mode 100644
index e58cc080..00000000
--- a/themes/rose-pine/swayosd.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@define-color background-color #faf4ed;
-@define-color border-color #575279;
-@define-color label #575279;
-@define-color image #575279;
-@define-color progress #575279;
-
diff --git a/themes/rose-pine/walker.css b/themes/rose-pine/walker.css
deleted file mode 100644
index a6188c87..00000000
--- a/themes/rose-pine/walker.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@define-color selected-text #88C0D0;
-@define-color text #575279;
-@define-color base #faf4ed;
-@define-color border #575279;
-@define-color foreground #575279;
-@define-color background #faf4ed;
diff --git a/themes/rose-pine/waybar.css b/themes/rose-pine/waybar.css
deleted file mode 100644
index d2e59424..00000000
--- a/themes/rose-pine/waybar.css
+++ /dev/null
@@ -1,2 +0,0 @@
-@define-color foreground #575279;
-@define-color background #faf4ed;
diff --git a/themes/tokyo-night/alacritty.toml b/themes/tokyo-night/alacritty.toml
deleted file mode 100644
index 19c1e22d..00000000
--- a/themes/tokyo-night/alacritty.toml
+++ /dev/null
@@ -1,29 +0,0 @@
-[colors]
-[colors.primary]
-background = '#1a1b26'
-foreground = '#a9b1d6'
-
-# Normal colors
-[colors.normal]
-black = '#32344a'
-red = '#f7768e'
-green = '#9ece6a'
-yellow = '#e0af68'
-blue = '#7aa2f7'
-magenta = '#ad8ee6'
-cyan = '#449dab'
-white = '#787c99'
-
-# Bright colors
-[colors.bright]
-black = '#444b6a'
-red = '#ff7a93'
-green = '#b9f27c'
-yellow = '#ff9e64'
-blue = '#7da6ff'
-magenta = '#bb9af7'
-cyan = '#0db9d7'
-white = '#acb0d0'
-
-[colors.selection]
-background = '#7aa2f7'
diff --git a/themes/tokyo-night/colors.toml b/themes/tokyo-night/colors.toml
new file mode 100644
index 00000000..7fb020cf
--- /dev/null
+++ b/themes/tokyo-night/colors.toml
@@ -0,0 +1,26 @@
+accent = "#7aa2f7"
+active_border_color = "#7aa2f7"
+active_tab_background = "#7aa2f7"
+
+cursor = "#c0caf5"
+foreground = "#a9b1d6"
+background = "#1a1b26"
+selection_foreground = "#c0caf5"
+selection_background = "#7aa2f7"
+
+color0 = "#32344a"
+color1 = "#f7768e"
+color2 = "#9ece6a"
+color3 = "#e0af68"
+color4 = "#7aa2f7"
+color5 = "#ad8ee6"
+color6 = "#449dab"
+color7 = "#787c99"
+color8 = "#444b6a"
+color9 = "#ff7a93"
+color10 = "#b9f27c"
+color11 = "#ff9e64"
+color12 = "#7da6ff"
+color13 = "#bb9af7"
+color14 = "#0db9d7"
+color15 = "#acb0d0"
diff --git a/themes/tokyo-night/ghostty.conf b/themes/tokyo-night/ghostty.conf
deleted file mode 100644
index 845659fb..00000000
--- a/themes/tokyo-night/ghostty.conf
+++ /dev/null
@@ -1 +0,0 @@
-theme = TokyoNight
diff --git a/themes/tokyo-night/hyprland-preview-share-picker.css b/themes/tokyo-night/hyprland-preview-share-picker.css
deleted file mode 100644
index 698c62c2..00000000
--- a/themes/tokyo-night/hyprland-preview-share-picker.css
+++ /dev/null
@@ -1,94 +0,0 @@
-@define-color foreground #c0caf5;
-@define-color background #1a1b26;
-@define-color accent #7aa2f7;
-@define-color muted #565f89;
-@define-color card_bg #24283b;
-@define-color text_dark #15161e;
-@define-color accent_hover #9ec1ff;
-@define-color selected_tab #7dcfff;
-@define-color text #c0caf5;
-
-* {
-  all: unset;
-  font-family: JetBrains Mono NF;
-  color: @foreground;
-  font-weight: bold;
-  font-size: 16px;
-}
-
-.window {
-  background: alpha(@background, 0.95);
-  border: solid 2px @accent;
-  margin: 4px;
-  padding: 18px;
-}
-
-tabs {
-    padding: 0.5rem 1rem;
-}
-
-tabs > tab {
-    margin-right: 1rem;
-}
-
-.tab-label {
-    color: @text;
-    transition: all 0.2s ease;
-}
-
-tabs > tab:checked > .tab-label, tabs > tab:active > .tab-label {
-    text-decoration: underline currentColor;
-    color: @selected_tab;
-}
-
-tabs > tab:focus > .tab-label {
-    color: @foreground;
-}
-
-.page {
-    padding: 1rem;
-}
-
-.image-label {
-    font-size: 12px;
-    padding: 0.25rem;
-}
-
-flowboxchild > .card, button > .card {
-    transition: all 0.2s ease;
-    border: solid 2px transparent;
-    border-color: @background;
-    border-radius: 5px;
-    background-color: @card_bg;
-    padding: 5px;
-}
-
-flowboxchild:hover > .card, button:hover > .card, flowboxchild:active > .card, flowboxchild:selected > .card, button:active > .card, button:selected > .card, button:focus > .card {
-    border: solid 2px @accent;
-}
-
-.image {
-    border-radius: 5px;
-}
-
-.region-button {
-    padding: 0.5rem 1rem;
-    border-radius: 5px;
-    background-color: @accent;
-    color: @text_dark;
-    transition: all 0.2s ease;
-}
-
-.region-button > label {
-    color: @text_dark;
-}
-
-.region-button:not(:disabled):hover, .region-button:not(:disabled):focus {
-    background-color: @accent_hover;
-    color: @text_dark;
-}
-
-.region-button:disabled {
-    background-color: @muted;
-    color: @background;
-}
diff --git a/themes/tokyo-night/hyprland.conf b/themes/tokyo-night/hyprland.conf
deleted file mode 100644
index 779a27d4..00000000
--- a/themes/tokyo-night/hyprland.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-$activeBorderColor = rgba(33ccffee) rgba(00ff99ee) 45deg
-
-general {
-    col.active_border = $activeBorderColor
-}
-
-group {
-    col.border_active = $activeBorderColor
-}
-
diff --git a/themes/tokyo-night/hyprlock.conf b/themes/tokyo-night/hyprlock.conf
deleted file mode 100644
index 7ef8abb3..00000000
--- a/themes/tokyo-night/hyprlock.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-$color = rgba(26,27,38,1.0)
-$inner_color = rgba(26,27,38,0.8)
-$outer_color = rgba(205,214,244,1.0)
-$font_color = rgba(205,214,244,1.0)
-$check_color = rgba(68, 157, 171, 1.0)
diff --git a/themes/tokyo-night/kitty.conf b/themes/tokyo-night/kitty.conf
deleted file mode 100644
index 37a5bd27..00000000
--- a/themes/tokyo-night/kitty.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-## name: Tokyo Night
-## license: MIT
-## author: Folke Lemaitre
-## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_night.conf
-
-
-background #1a1b26
-foreground #c0caf5
-selection_background #283457
-selection_foreground #c0caf5
-url_color #73daca
-cursor #c0caf5
-cursor_text_color #1a1b26
-
-# Tabs
-active_tab_background #7aa2f7
-active_tab_foreground #16161e
-inactive_tab_background #292e42
-inactive_tab_foreground #545c7e
-#tab_bar_background #15161e
-
-# Windows
-active_border_color #7aa2f7
-inactive_border_color #292e42
-
-# normal
-color0 #15161e
-color1 #f7768e
-color2 #9ece6a
-color3 #e0af68
-color4 #7aa2f7
-color5 #bb9af7
-color6 #7dcfff
-color7 #a9b1d6
-
-# bright
-color8 #414868
-color9 #f7768e
-color10 #9ece6a
-color11 #e0af68
-color12 #7aa2f7
-color13 #bb9af7
-color14 #7dcfff
-color15 #c0caf5
-
-# extended colors
-color16 #ff9e64
-color17 #db4b4b
diff --git a/themes/tokyo-night/mako.ini b/themes/tokyo-night/mako.ini
deleted file mode 100644
index b1649be1..00000000
--- a/themes/tokyo-night/mako.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-include=~/.local/share/omarchy/default/mako/core.ini
-
-text-color=#c0caf5
-border-color=#33ccff
-background-color=#1a1b26
diff --git a/themes/tokyo-night/swayosd.css b/themes/tokyo-night/swayosd.css
deleted file mode 100644
index 1300b6ad..00000000
--- a/themes/tokyo-night/swayosd.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@define-color background-color #1a1b26;
-@define-color border-color #33ccff;
-@define-color label #a9b1d6;
-@define-color image #a9b1d6;
-@define-color progress #a9b1d6;
-
diff --git a/themes/tokyo-night/walker.css b/themes/tokyo-night/walker.css
deleted file mode 100644
index aeb271d1..00000000
--- a/themes/tokyo-night/walker.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@define-color selected-text #7dcfff;
-@define-color text #cfc9c2;
-@define-color base #1a1b26;
-@define-color border #33ccff;
-@define-color foreground #cfc9c2;
-@define-color background #1a1b26;
diff --git a/themes/tokyo-night/waybar.css b/themes/tokyo-night/waybar.css
deleted file mode 100644
index ecd3da04..00000000
--- a/themes/tokyo-night/waybar.css
+++ /dev/null
@@ -1,2 +0,0 @@
-@define-color foreground #cdd6f4;
-@define-color background #1a1b26;