From 652fa31e8ef9fcf4c026a41751ceb8ce3977c366 Mon Sep 17 00:00:00 2001
From: Cookie <52550063+Covkie@users.noreply.github.com>
Date: Mon, 2 Dec 2024 19:28:46 -0500
Subject: [PATCH] fix: latte dark/light being inverted (#60)

---
 src/templates/alias.tera               | 4 ++--
 src/templates/all-scroll.tera          | 4 ++--
 src/templates/bottom_left_corner.tera  | 4 ++--
 src/templates/bottom_right_corner.tera | 4 ++--
 src/templates/bottom_side.tera         | 4 ++--
 src/templates/cell.tera                | 4 ++--
 src/templates/center_ptr.tera          | 4 ++--
 src/templates/col-resize.tera          | 4 ++--
 src/templates/color-picker.tera        | 4 ++--
 src/templates/context-menu.tera        | 4 ++--
 src/templates/copy.tera                | 4 ++--
 src/templates/crosshair.tera           | 4 ++--
 src/templates/default.tera             | 4 ++--
 src/templates/dnd-move.tera            | 4 ++--
 src/templates/dnd-no-drop.tera         | 4 ++--
 src/templates/down-arrow.tera          | 4 ++--
 src/templates/draft.tera               | 4 ++--
 src/templates/help.tera                | 4 ++--
 src/templates/left-arrow.tera          | 4 ++--
 src/templates/left_side.tera           | 4 ++--
 src/templates/no-drop.tera             | 4 ++--
 src/templates/not-allowed.tera         | 4 ++--
 src/templates/openhand.tera            | 4 ++--
 src/templates/pencil.tera              | 4 ++--
 src/templates/pirate.tera              | 4 ++--
 src/templates/pointer.tera             | 4 ++--
 src/templates/progress-01.tera         | 4 ++--
 src/templates/progress-02.tera         | 4 ++--
 src/templates/progress-03.tera         | 4 ++--
 src/templates/progress-04.tera         | 4 ++--
 src/templates/progress-05.tera         | 4 ++--
 src/templates/progress-06.tera         | 4 ++--
 src/templates/progress-07.tera         | 4 ++--
 src/templates/progress-08.tera         | 4 ++--
 src/templates/progress-09.tera         | 4 ++--
 src/templates/progress-10.tera         | 4 ++--
 src/templates/progress-11.tera         | 4 ++--
 src/templates/progress-12.tera         | 4 ++--
 src/templates/right-arrow.tera         | 4 ++--
 src/templates/right_ptr.tera           | 4 ++--
 src/templates/right_side.tera          | 4 ++--
 src/templates/row-resize.tera          | 4 ++--
 src/templates/size_bdiag.tera          | 4 ++--
 src/templates/size_fdiag.tera          | 4 ++--
 src/templates/size_hor.tera            | 4 ++--
 src/templates/size_ver.tera            | 4 ++--
 src/templates/text.tera                | 4 ++--
 src/templates/top_left_corner.tera     | 4 ++--
 src/templates/top_right_corner.tera    | 4 ++--
 src/templates/top_side.tera            | 4 ++--
 src/templates/up-arrow.tera            | 4 ++--
 src/templates/vertical-text.tera       | 4 ++--
 src/templates/wait-01.tera             | 4 ++--
 src/templates/wait-02.tera             | 4 ++--
 src/templates/wait-03.tera             | 4 ++--
 src/templates/wait-04.tera             | 4 ++--
 src/templates/wait-05.tera             | 4 ++--
 src/templates/wait-06.tera             | 4 ++--
 src/templates/wait-07.tera             | 4 ++--
 src/templates/wait-08.tera             | 4 ++--
 src/templates/wait-09.tera             | 4 ++--
 src/templates/wait-10.tera             | 4 ++--
 src/templates/wait-11.tera             | 4 ++--
 src/templates/wait-12.tera             | 4 ++--
 src/templates/wayland-cursor.tera      | 4 ++--
 src/templates/x-cursor.tera            | 4 ++--
 src/templates/zoom-in.tera             | 4 ++--
 src/templates/zoom-out.tera            | 4 ++--
 68 files changed, 136 insertions(+), 136 deletions(-)

diff --git a/src/templates/alias.tera b/src/templates/alias.tera
index 93a9ba19..3360dfdb 100644
--- a/src/templates/alias.tera
+++ b/src/templates/alias.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/alias.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["mauve"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/all-scroll.tera b/src/templates/all-scroll.tera
index 7bd1c798..a3bf019d 100644
--- a/src/templates/all-scroll.tera
+++ b/src/templates/all-scroll.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/all-scroll.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/bottom_left_corner.tera b/src/templates/bottom_left_corner.tera
index 9344e59c..2d00b347 100644
--- a/src/templates/bottom_left_corner.tera
+++ b/src/templates/bottom_left_corner.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/bottom_left_corner.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/bottom_right_corner.tera b/src/templates/bottom_right_corner.tera
index 9802f3a1..f42055c2 100644
--- a/src/templates/bottom_right_corner.tera
+++ b/src/templates/bottom_right_corner.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/bottom_right_corner.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/bottom_side.tera b/src/templates/bottom_side.tera
index b0a69dd8..3e529db8 100644
--- a/src/templates/bottom_side.tera
+++ b/src/templates/bottom_side.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/bottom_side.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/cell.tera b/src/templates/cell.tera
index 2ba79a45..82fd063d 100644
--- a/src/templates/cell.tera
+++ b/src/templates/cell.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/cell.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/center_ptr.tera b/src/templates/center_ptr.tera
index 4e309c58..c08b5101 100644
--- a/src/templates/center_ptr.tera
+++ b/src/templates/center_ptr.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/center_ptr.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
    {%- set inner = flavor.colors["base"] -%}
    {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
    {%- set inner = flavor.colors["text"] -%}
    {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/col-resize.tera b/src/templates/col-resize.tera
index 7f672bf8..05c97fb2 100644
--- a/src/templates/col-resize.tera
+++ b/src/templates/col-resize.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/col-resize.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/color-picker.tera b/src/templates/color-picker.tera
index c483015c..c3f5f05a 100644
--- a/src/templates/color-picker.tera
+++ b/src/templates/color-picker.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/color-picker.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
    {%- set inner = flavor.colors["base"] -%}
    {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
    {%- set inner = flavor.colors["text"] -%}
    {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/context-menu.tera b/src/templates/context-menu.tera
index 40c86f66..268e0f63 100644
--- a/src/templates/context-menu.tera
+++ b/src/templates/context-menu.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/context-menu.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["mauve"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/copy.tera b/src/templates/copy.tera
index 7ced900d..893692f0 100644
--- a/src/templates/copy.tera
+++ b/src/templates/copy.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/copy.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["green"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/crosshair.tera b/src/templates/crosshair.tera
index 9be9d219..a3ff5ea8 100644
--- a/src/templates/crosshair.tera
+++ b/src/templates/crosshair.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/crosshair.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/default.tera b/src/templates/default.tera
index be937f69..d0c8b767 100644
--- a/src/templates/default.tera
+++ b/src/templates/default.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/default.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/dnd-move.tera b/src/templates/dnd-move.tera
index 7612a2eb..12631420 100644
--- a/src/templates/dnd-move.tera
+++ b/src/templates/dnd-move.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/dnd-move.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/dnd-no-drop.tera b/src/templates/dnd-no-drop.tera
index 2157835e..6d761b64 100644
--- a/src/templates/dnd-no-drop.tera
+++ b/src/templates/dnd-no-drop.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/dnd-no-drop.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["red"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/down-arrow.tera b/src/templates/down-arrow.tera
index 6b794c50..e67fec7e 100644
--- a/src/templates/down-arrow.tera
+++ b/src/templates/down-arrow.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/down-arrow.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/draft.tera b/src/templates/draft.tera
index 42d29d1b..c18dba59 100644
--- a/src/templates/draft.tera
+++ b/src/templates/draft.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/draft.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/help.tera b/src/templates/help.tera
index 0fc4f51e..982a8723 100644
--- a/src/templates/help.tera
+++ b/src/templates/help.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/help.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["blue"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/left-arrow.tera b/src/templates/left-arrow.tera
index 2bb08742..bdaf42ad 100644
--- a/src/templates/left-arrow.tera
+++ b/src/templates/left-arrow.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/left-arrow.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/left_side.tera b/src/templates/left_side.tera
index d0120aad..e9b9fed5 100644
--- a/src/templates/left_side.tera
+++ b/src/templates/left_side.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/left_side.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/no-drop.tera b/src/templates/no-drop.tera
index 516bf827..3d5fee48 100644
--- a/src/templates/no-drop.tera
+++ b/src/templates/no-drop.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/no-drop.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["red"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/not-allowed.tera b/src/templates/not-allowed.tera
index b287b287..2e2d724d 100644
--- a/src/templates/not-allowed.tera
+++ b/src/templates/not-allowed.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/not-allowed.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["red"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/openhand.tera b/src/templates/openhand.tera
index bb81cd05..6060b450 100644
--- a/src/templates/openhand.tera
+++ b/src/templates/openhand.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/openhand.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/pencil.tera b/src/templates/pencil.tera
index 713bf1ca..e63c06c7 100644
--- a/src/templates/pencil.tera
+++ b/src/templates/pencil.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/pencil.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/pirate.tera b/src/templates/pirate.tera
index 961dd861..1fcf5b02 100644
--- a/src/templates/pirate.tera
+++ b/src/templates/pirate.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/pirate.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["red"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/pointer.tera b/src/templates/pointer.tera
index db03cd87..64ac51a0 100644
--- a/src/templates/pointer.tera
+++ b/src/templates/pointer.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/pointer.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/progress-01.tera b/src/templates/progress-01.tera
index 13aac00c..7df746ab 100644
--- a/src/templates/progress-01.tera
+++ b/src/templates/progress-01.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/progress-01.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["lavender"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/progress-02.tera b/src/templates/progress-02.tera
index 5c5ce7e6..c1d0b99f 100644
--- a/src/templates/progress-02.tera
+++ b/src/templates/progress-02.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/progress-02.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["lavender"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/progress-03.tera b/src/templates/progress-03.tera
index ad00c5f9..ae444f1f 100644
--- a/src/templates/progress-03.tera
+++ b/src/templates/progress-03.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/progress-03.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["lavender"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/progress-04.tera b/src/templates/progress-04.tera
index 547054f5..1c02d13e 100644
--- a/src/templates/progress-04.tera
+++ b/src/templates/progress-04.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/progress-04.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["lavender"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/progress-05.tera b/src/templates/progress-05.tera
index f448991b..ab9670c7 100644
--- a/src/templates/progress-05.tera
+++ b/src/templates/progress-05.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/progress-05.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["lavender"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/progress-06.tera b/src/templates/progress-06.tera
index b40a2b3a..8192e41f 100644
--- a/src/templates/progress-06.tera
+++ b/src/templates/progress-06.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/progress-06.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["lavender"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/progress-07.tera b/src/templates/progress-07.tera
index c361dbeb..844105ec 100644
--- a/src/templates/progress-07.tera
+++ b/src/templates/progress-07.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/progress-07.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["lavender"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/progress-08.tera b/src/templates/progress-08.tera
index 5f191390..82f424dd 100644
--- a/src/templates/progress-08.tera
+++ b/src/templates/progress-08.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/progress-08.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["lavender"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/progress-09.tera b/src/templates/progress-09.tera
index cdaff211..0417fe09 100644
--- a/src/templates/progress-09.tera
+++ b/src/templates/progress-09.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/progress-09.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["lavender"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/progress-10.tera b/src/templates/progress-10.tera
index c8848f72..fba78de6 100644
--- a/src/templates/progress-10.tera
+++ b/src/templates/progress-10.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/progress-10.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["lavender"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/progress-11.tera b/src/templates/progress-11.tera
index 14b4fd8e..9900f5dc 100644
--- a/src/templates/progress-11.tera
+++ b/src/templates/progress-11.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/progress-11.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["lavender"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/progress-12.tera b/src/templates/progress-12.tera
index 40a58b1b..7a411287 100644
--- a/src/templates/progress-12.tera
+++ b/src/templates/progress-12.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/progress-12.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["lavender"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/right-arrow.tera b/src/templates/right-arrow.tera
index 1098a18b..bba398e7 100644
--- a/src/templates/right-arrow.tera
+++ b/src/templates/right-arrow.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/right-arrow.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/right_ptr.tera b/src/templates/right_ptr.tera
index f38a72df..4efbe053 100644
--- a/src/templates/right_ptr.tera
+++ b/src/templates/right_ptr.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/right_ptr.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/right_side.tera b/src/templates/right_side.tera
index 24d7bc1f..ebf5d960 100644
--- a/src/templates/right_side.tera
+++ b/src/templates/right_side.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/right_side.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/row-resize.tera b/src/templates/row-resize.tera
index 4cee7ca6..861e0ac9 100644
--- a/src/templates/row-resize.tera
+++ b/src/templates/row-resize.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/row-resize.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/size_bdiag.tera b/src/templates/size_bdiag.tera
index 171eda61..9478647a 100644
--- a/src/templates/size_bdiag.tera
+++ b/src/templates/size_bdiag.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/size_bdiag.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/size_fdiag.tera b/src/templates/size_fdiag.tera
index f29d5344..f4aecb56 100644
--- a/src/templates/size_fdiag.tera
+++ b/src/templates/size_fdiag.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/size_fdiag.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/size_hor.tera b/src/templates/size_hor.tera
index 93f9f593..b333436c 100644
--- a/src/templates/size_hor.tera
+++ b/src/templates/size_hor.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/size_hor.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/size_ver.tera b/src/templates/size_ver.tera
index 8f6a1dab..f8914b00 100644
--- a/src/templates/size_ver.tera
+++ b/src/templates/size_ver.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/size_ver.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/text.tera b/src/templates/text.tera
index 3a0a60ae..e98b8da0 100644
--- a/src/templates/text.tera
+++ b/src/templates/text.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/text.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/top_left_corner.tera b/src/templates/top_left_corner.tera
index b77e3d88..a81ceecd 100644
--- a/src/templates/top_left_corner.tera
+++ b/src/templates/top_left_corner.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/top_left_corner.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/top_right_corner.tera b/src/templates/top_right_corner.tera
index bd26ccf0..ca6a28f7 100644
--- a/src/templates/top_right_corner.tera
+++ b/src/templates/top_right_corner.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/top_right_corner.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/top_side.tera b/src/templates/top_side.tera
index 2fd3ddfd..8283c5ec 100644
--- a/src/templates/top_side.tera
+++ b/src/templates/top_side.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/top_side.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/up-arrow.tera b/src/templates/up-arrow.tera
index 87102fac..8208ff5f 100644
--- a/src/templates/up-arrow.tera
+++ b/src/templates/up-arrow.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/up-arrow.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/vertical-text.tera b/src/templates/vertical-text.tera
index 18c4b82c..6c4b6d58 100644
--- a/src/templates/vertical-text.tera
+++ b/src/templates/vertical-text.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/vertical-text.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/wait-01.tera b/src/templates/wait-01.tera
index a25ff1a2..f17ded90 100644
--- a/src/templates/wait-01.tera
+++ b/src/templates/wait-01.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/wait-01.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["lavender"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/wait-02.tera b/src/templates/wait-02.tera
index aaf69aee..754904c0 100644
--- a/src/templates/wait-02.tera
+++ b/src/templates/wait-02.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/wait-02.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["lavender"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/wait-03.tera b/src/templates/wait-03.tera
index ac79661e..0ff17a4c 100644
--- a/src/templates/wait-03.tera
+++ b/src/templates/wait-03.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/wait-03.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["lavender"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/wait-04.tera b/src/templates/wait-04.tera
index 1d766451..96b77529 100644
--- a/src/templates/wait-04.tera
+++ b/src/templates/wait-04.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/wait-04.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["lavender"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/wait-05.tera b/src/templates/wait-05.tera
index 7d55d42c..7710018e 100644
--- a/src/templates/wait-05.tera
+++ b/src/templates/wait-05.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/wait-05.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["lavender"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/wait-06.tera b/src/templates/wait-06.tera
index 2deb97c8..f5de6fd7 100644
--- a/src/templates/wait-06.tera
+++ b/src/templates/wait-06.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/wait-06.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["lavender"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/wait-07.tera b/src/templates/wait-07.tera
index e7997a76..8b9911aa 100644
--- a/src/templates/wait-07.tera
+++ b/src/templates/wait-07.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/wait-07.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["lavender"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/wait-08.tera b/src/templates/wait-08.tera
index 51f8533c..9fb78b3c 100644
--- a/src/templates/wait-08.tera
+++ b/src/templates/wait-08.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/wait-08.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["lavender"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/wait-09.tera b/src/templates/wait-09.tera
index a8850f71..4307d38c 100644
--- a/src/templates/wait-09.tera
+++ b/src/templates/wait-09.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/wait-09.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["lavender"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/wait-10.tera b/src/templates/wait-10.tera
index 89c31936..aaf67d7d 100644
--- a/src/templates/wait-10.tera
+++ b/src/templates/wait-10.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/wait-10.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["lavender"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/wait-11.tera b/src/templates/wait-11.tera
index 617998f8..4460bec5 100644
--- a/src/templates/wait-11.tera
+++ b/src/templates/wait-11.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/wait-11.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["lavender"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/wait-12.tera b/src/templates/wait-12.tera
index 5191eaca..1fbd1bf1 100644
--- a/src/templates/wait-12.tera
+++ b/src/templates/wait-12.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/wait-12.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["lavender"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/wayland-cursor.tera b/src/templates/wayland-cursor.tera
index 453be63b..c2563e4b 100644
--- a/src/templates/wayland-cursor.tera
+++ b/src/templates/wayland-cursor.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/wayland-cursor.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["peach"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/x-cursor.tera b/src/templates/x-cursor.tera
index d6c2c0c3..97ebacb0 100644
--- a/src/templates/x-cursor.tera
+++ b/src/templates/x-cursor.tera
@@ -6,11 +6,11 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/x-cursor.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
   {%- set special = flavor.colors["maroon"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
   {%- set special = border -%}
diff --git a/src/templates/zoom-in.tera b/src/templates/zoom-in.tera
index 46e3f741..a41edb16 100644
--- a/src/templates/zoom-in.tera
+++ b/src/templates/zoom-in.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/zoom-in.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}
diff --git a/src/templates/zoom-out.tera b/src/templates/zoom-out.tera
index 471d0a1b..8c2a7de6 100644
--- a/src/templates/zoom-out.tera
+++ b/src/templates/zoom-out.tera
@@ -6,10 +6,10 @@ whiskers:
     - flavor
   filename: "svgs/catppuccin-{{flavor.identifier}}-{{accent}}-cursors/zoom-out.svg"
 ---
-{%- if accent == 'dark' %}
+{%- if (flavor.light and accent == 'light') or (flavor.dark and accent == 'dark') %}
   {%- set inner = flavor.colors["base"] -%}
   {%- set border = flavor.colors["text"] -%}
-{% elif accent == 'light' %}
+{% elif (flavor.dark and accent == 'light') or (flavor.light and accent == 'dark') %}
   {%- set inner = flavor.colors["text"] -%}
   {%- set border = flavor.colors["base"] -%}
 {% else %}