Refactor theme CSS files to remove unnecessary color-scheme property

scripts/rebuild-themes.py

@@ -31,11 +31,8 @@ def write_colors(colors_file, output_file):
                 if color == "isDarkMode":
                     continue
                 f.write(f'    {get_color_css_variable(color)}: {colors[color]} !important;\n')
-            if colors["isDarkMode"]:
-                f.write('    color-scheme: dark !important;\n')
-            else:
-                f.write('    color-scheme: light !important;\n')
             f.write('}\n')
+        return colors
 
 def main():
     with open(THEMES_DATA_FILE, 'w') as f:
@@ -51,14 +48,17 @@ def main():
             theme_data = json.load(f)
             with open(THEMES_DATA_FILE, 'r') as f:
                 themes_data = json.load(f)
+                theme_colors_file = os.path.join(theme_folder, 'colors.json')
+                if os.path.exists(theme_colors_file):
+                    print(f"  Found colors.json in theme: {theme}")
+                    theme_colors_output = os.path.join(theme_folder, 'chrome.css')
+                    colors = write_colors(theme_colors_file, theme_colors_output)
+                    if 'isDarkMode' in colors: 
+                        theme_data['isDarkMode'] = colors['isDarkMode'] 
+                    theme_data['isColorTheme'] = True
                 themes_data[theme] = theme_data
                 with open(THEMES_DATA_FILE, 'w') as f:
                     json.dump(themes_data, f, indent=4)
-        theme_colors_file = os.path.join(theme_folder, 'colors.json')
-        if os.path.exists(theme_colors_file):
-            print(f"  Found colors.json in theme: {theme}")
-            theme_colors_output = os.path.join(theme_folder, 'chrome.css')
-            write_colors(theme_colors_file, theme_colors_output)
         print(f"Rebuilt theme: {theme}")
     print("Rebuilt all themes!")
   

themes.json

@@ -1,4 +1,59 @@
 {
+    "ea1a5ace-f698-4b45-ab88-6e8bd3a563f0": {
+        "id": "ea1a5ace-f698-4b45-ab88-6e8bd3a563f0",
+        "name": "Bookmark Toolbar Tweaks",
+        "description": "Center bookmarks, hide the icons!",
+        "homepage": "https://github.com/n7itro/Zen-Themes/",
+        "style": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/ea1a5ace-f698-4b45-ab88-6e8bd3a563f0/chrome.css",
+        "readme": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/ea1a5ace-f698-4b45-ab88-6e8bd3a563f0/readme.md",
+        "image": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/ea1a5ace-f698-4b45-ab88-6e8bd3a563f0/image.png",
+        "author": "n7itro",
+        "preferences": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/ea1a5ace-f698-4b45-ab88-6e8bd3a563f0/preferences.json"
+    },
+    "782c1dae-bada-4f90-b00f-446e5f6e8402": {
+        "id": "782c1dae-bada-4f90-b00f-446e5f6e8402",
+        "name": "Compact Sidebar",
+        "description": "Allow the tab sidebar to take up less space! New: Smaller Compact Mode",
+        "homepage": "https://github.com/n7itro/Zen-Themes/",
+        "style": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/782c1dae-bada-4f90-b00f-446e5f6e8402/chrome.css",
+        "readme": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/782c1dae-bada-4f90-b00f-446e5f6e8402/readme.md",
+        "image": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/782c1dae-bada-4f90-b00f-446e5f6e8402/image.png",
+        "author": "n7itro",
+        "preferences": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/782c1dae-bada-4f90-b00f-446e5f6e8402/preferences.json"
+    },
+    "ef16716a-58dc-42d4-99f8-b1667d32247d": {
+        "id": "ef16716a-58dc-42d4-99f8-b1667d32247d",
+        "name": "Formula 1",
+        "description": "Embrace the simplicity of black and red",
+        "homepage": "",
+        "style": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/ef16716a-58dc-42d4-99f8-b1667d32247d/chrome.css",
+        "readme": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/ef16716a-58dc-42d4-99f8-b1667d32247d/readme.md",
+        "image": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/ef16716a-58dc-42d4-99f8-b1667d32247d/image.png",
+        "author": "thejournalwriter",
+        "isDarkMode": true,
+        "isColorTheme": true
+    },
+    "83a641f7-eca9-4c0f-91af-45627bef0539": {
+        "id": "83a641f7-eca9-4c0f-91af-45627bef0539",
+        "name": "Floating URLbar",
+        "description": "Levitate the URL bar when focusing on it, with a blurred background.",
+        "homepage": "https://github.com/zen-browser/theme-components",
+        "style": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/83a641f7-eca9-4c0f-91af-45627bef0539/chrome.css",
+        "readme": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/83a641f7-eca9-4c0f-91af-45627bef0539/readme.md",
+        "image": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/83a641f7-eca9-4c0f-91af-45627bef0539/image.png",
+        "author": "mauro-balades"
+    },
+    "5a007026-0801-4a5d-9740-f17dc1c3ff21": {
+        "id": "5a007026-0801-4a5d-9740-f17dc1c3ff21",
+        "name": "Hide Window Buttons",
+        "description": "Hide the minimize, maximize, and close window buttons",
+        "homepage": "https://github.com/n7itro/Zen-Themes",
+        "style": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/5a007026-0801-4a5d-9740-f17dc1c3ff21/chrome.css",
+        "readme": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/5a007026-0801-4a5d-9740-f17dc1c3ff21/readme.md",
+        "image": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/5a007026-0801-4a5d-9740-f17dc1c3ff21/image.png",
+        "author": "n7itro",
+        "preferences": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/5a007026-0801-4a5d-9740-f17dc1c3ff21/preferences.json"
+    },
     "17f70712-4530-42d0-ba0f-fa25bcbf2ddc": {
         "id": "17f70712-4530-42d0-ba0f-fa25bcbf2ddc",
         "name": "Vesper Dark",
@@ -7,27 +62,9 @@
         "style": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/17f70712-4530-42d0-ba0f-fa25bcbf2ddc/chrome.css",
         "readme": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/17f70712-4530-42d0-ba0f-fa25bcbf2ddc/readme.md",
         "image": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/17f70712-4530-42d0-ba0f-fa25bcbf2ddc/image.png",
-        "author": "bdsqqq"
+        "author": "bdsqqq",
-    },
+        "isDarkMode": true,
-    "c6813222-6571-4ba6-8faf-58f3343324f6": {
+        "isColorTheme": true
-        "id": "c6813222-6571-4ba6-8faf-58f3343324f6",
-        "name": "Disable Rounded Corners",
-        "description": "Disable Rounded Corners from Web View.",
-        "homepage": "https://github.com/gunir/desktop/tree/themes/themes",
-        "style": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/c6813222-6571-4ba6-8faf-58f3343324f6/chrome.css",
-        "readme": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/c6813222-6571-4ba6-8faf-58f3343324f6/readme.md",
-        "image": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/c6813222-6571-4ba6-8faf-58f3343324f6/image.png",
-        "author": "gunir"
-    },
-    "e3eec307-7c64-4cbd-a0c5-3447cd45a840": {
-        "id": "e3eec307-7c64-4cbd-a0c5-3447cd45a840",
-        "name": "Catppuccin",
-        "description": "Dive into Catppuccin's, unique pastel color theme for Zen!",
-        "homepage": "https://catppuccin.com/",
-        "style": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/e3eec307-7c64-4cbd-a0c5-3447cd45a840/chrome.css",
-        "readme": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/e3eec307-7c64-4cbd-a0c5-3447cd45a840/readme.md",
-        "image": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/e3eec307-7c64-4cbd-a0c5-3447cd45a840/image.png",
-        "author": "mauro-balades"
     },
     "053a3ffa-9233-4554-88f3-076e6a6ebb43": {
         "id": "053a3ffa-9233-4554-88f3-076e6a6ebb43",
@@ -49,57 +86,26 @@
         "image": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/680424a8-a818-406b-98c5-7726214e2a9f/image.png",
         "author": "mauro-balades"
     },
-    "782c1dae-bada-4f90-b00f-446e5f6e8402": {
+    "e3eec307-7c64-4cbd-a0c5-3447cd45a840": {
-        "id": "782c1dae-bada-4f90-b00f-446e5f6e8402",
+        "id": "e3eec307-7c64-4cbd-a0c5-3447cd45a840",
-        "name": "Compact Sidebar",
+        "name": "Catppuccin",
-        "description": "Allow the tab sidebar to take up less space! New: Smaller Compact Mode",
+        "description": "Dive into Catppuccin's, unique pastel color theme for Zen!",
-        "homepage": "https://github.com/n7itro/Zen-Themes/",
+        "homepage": "https://catppuccin.com/",
-        "style": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/782c1dae-bada-4f90-b00f-446e5f6e8402/chrome.css",
+        "style": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/e3eec307-7c64-4cbd-a0c5-3447cd45a840/chrome.css",
-        "readme": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/782c1dae-bada-4f90-b00f-446e5f6e8402/readme.md",
+        "readme": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/e3eec307-7c64-4cbd-a0c5-3447cd45a840/readme.md",
-        "image": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/782c1dae-bada-4f90-b00f-446e5f6e8402/image.png",
+        "image": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/e3eec307-7c64-4cbd-a0c5-3447cd45a840/image.png",
-        "author": "n7itro",
+        "author": "mauro-balades",
-        "preferences": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/782c1dae-bada-4f90-b00f-446e5f6e8402/preferences.json"
+        "isDarkMode": true,
+        "isColorTheme": true
     },
-    "5a007026-0801-4a5d-9740-f17dc1c3ff21": {
+    "c6813222-6571-4ba6-8faf-58f3343324f6": {
-        "id": "5a007026-0801-4a5d-9740-f17dc1c3ff21",
+        "id": "c6813222-6571-4ba6-8faf-58f3343324f6",
-        "name": "Hide Window Buttons",
+        "name": "Disable Rounded Corners",
-        "description": "Hide the minimize, maximize, and close window buttons",
+        "description": "Disable Rounded Corners from Web View.",
-        "homepage": "https://github.com/n7itro/Zen-Themes",
+        "homepage": "https://github.com/gunir/desktop/tree/themes/themes",
-        "style": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/5a007026-0801-4a5d-9740-f17dc1c3ff21/chrome.css",
+        "style": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/c6813222-6571-4ba6-8faf-58f3343324f6/chrome.css",
-        "readme": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/5a007026-0801-4a5d-9740-f17dc1c3ff21/readme.md",
+        "readme": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/c6813222-6571-4ba6-8faf-58f3343324f6/readme.md",
-        "image": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/5a007026-0801-4a5d-9740-f17dc1c3ff21/image.png",
+        "image": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/c6813222-6571-4ba6-8faf-58f3343324f6/image.png",
-        "author": "n7itro",
+        "author": "gunir"
-        "preferences": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/5a007026-0801-4a5d-9740-f17dc1c3ff21/preferences.json"
-    },
-    "83a641f7-eca9-4c0f-91af-45627bef0539": {
-        "id": "83a641f7-eca9-4c0f-91af-45627bef0539",
-        "name": "Floating URLbar",
-        "description": "Levitate the URL bar when focusing on it, with a blurred background.",
-        "homepage": "https://github.com/zen-browser/theme-components",
-        "style": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/83a641f7-eca9-4c0f-91af-45627bef0539/chrome.css",
-        "readme": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/83a641f7-eca9-4c0f-91af-45627bef0539/readme.md",
-        "image": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/83a641f7-eca9-4c0f-91af-45627bef0539/image.png",
-        "author": "mauro-balades"
-    },
-    "ef16716a-58dc-42d4-99f8-b1667d32247d": {
-        "id": "ef16716a-58dc-42d4-99f8-b1667d32247d",
-        "name": "Formula 1",
-        "description": "Embrace the simplicity of black and red",
-        "homepage": "",
-        "style": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/ef16716a-58dc-42d4-99f8-b1667d32247d/chrome.css",
-        "readme": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/ef16716a-58dc-42d4-99f8-b1667d32247d/readme.md",
-        "image": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/ef16716a-58dc-42d4-99f8-b1667d32247d/image.png",
-        "author": "thejournalwriter"
-    },
-    "ea1a5ace-f698-4b45-ab88-6e8bd3a563f0": {
-        "id": "ea1a5ace-f698-4b45-ab88-6e8bd3a563f0",
-        "name": "Bookmark Toolbar Tweaks",
-        "description": "Center bookmarks, hide the icons!",
-        "homepage": "https://github.com/n7itro/Zen-Themes/",
-        "style": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/ea1a5ace-f698-4b45-ab88-6e8bd3a563f0/chrome.css",
-        "readme": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/ea1a5ace-f698-4b45-ab88-6e8bd3a563f0/readme.md",
-        "image": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/ea1a5ace-f698-4b45-ab88-6e8bd3a563f0/image.png",
-        "author": "n7itro",
-        "preferences": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/ea1a5ace-f698-4b45-ab88-6e8bd3a563f0/preferences.json"
     }
 }

themes/17f70712-4530-42d0-ba0f-fa25bcbf2ddc/chrome.css

@@ -4,5 +4,4 @@
     --zen-colors-secondary: #FFFFFF25 !important;
     --zen-colors-tertiary: #0E100E !important;
     --zen-colors-border: #282828 !important;
-    color-scheme: dark !important;
 }

themes/e3eec307-7c64-4cbd-a0c5-3447cd45a840/chrome.css

@@ -4,5 +4,4 @@
     --zen-colors-secondary: #1e2030 !important;
     --zen-colors-tertiary: #181926 !important;
     --zen-colors-border: #363a4f !important;
-    color-scheme: dark !important;
 }

themes/ef16716a-58dc-42d4-99f8-b1667d32247d/chrome.css

@@ -5,5 +5,4 @@
     --zen-colors-tertiary: color-mix(in srgb, var(--zen-primary-color) 10%, black 90%) !important;
     --zen-colors-border: color-mix(in srgb, var(--zen-colors-primary) 100%, black 0%) !important;
     --zen-primary-color: #ff2600 !important;
-    color-scheme: dark !important;
 }