From ada4df1971f8fb0a1efc6d094a5c03cc7fdd4d5b Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 20 Aug 2022 11:29:31 -0400
Subject: [PATCH] Fix invalid default values for popupTheme and popupOuterTheme
 (#2180)

* Fix invalid default values for popupTheme and popupOuterTheme

* Options update
---
 ext/data/schemas/options-schema.json | 4 ++--
 ext/js/data/options-util.js          | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ext/data/schemas/options-schema.json b/ext/data/schemas/options-schema.json
index 37b32bbf..09398fb0 100644
--- a/ext/data/schemas/options-schema.json
+++ b/ext/data/schemas/options-schema.json
@@ -215,12 +215,12 @@
                                     "popupTheme": {
                                         "type": "string",
                                         "enum": ["light", "dark", "browser"],
-                                        "default": "default"
+                                        "default": "light"
                                     },
                                     "popupOuterTheme": {
                                         "type": "string",
                                         "enum": ["light", "dark", "browser", "site"],
-                                        "default": "default"
+                                        "default": "light"
                                     },
                                     "customPopupCss": {
                                         "type": "string",
diff --git a/ext/js/data/options-util.js b/ext/js/data/options-util.js
index 8c50493a..d2835adb 100644
--- a/ext/js/data/options-util.js
+++ b/ext/js/data/options-util.js
@@ -980,8 +980,17 @@ class OptionsUtil {
     _updateVersion20(options) {
         // Version 20 changes:
         //  Added anki.downloadTimeout.
+        //  Fixed general.popupTheme invalid default.
+        //  Fixed general.popupOuterTheme invalid default.
         for (const profile of options.profiles) {
             profile.options.anki.downloadTimeout = 0;
+            const {general} = profile.options;
+            if (general.popupTheme === 'default') {
+                general.popupTheme = 'light';
+            }
+            if (general.popupOuterTheme === 'default') {
+                general.popupOuterTheme = 'light';
+            }
         }
         return options;
     }