3 files changed, 39 insertions, 4 deletions

diff --git a/src/webview/darkmode/custom.js b/src/webview/darkmode/custom.js
new file mode 100644
index 000000000..f767f5755
--- /dev/null
+++ b/src/webview/darkmode/custom.js
@@ -0,0 +1,22 @@
+// CSS for pages that need custom styles to work correctly in darkmode
+export default {
+  'web.whatsapp.com': `
+    div.landing-window > div.landing-main {
+      background-color: #FFFFFF !important;
+    }
+    div.landing-window > div.landing-main * {
+      color: #212121 !important;
+    }
+  `,
+  'web.threema.ch': `
+    .scan {
+      background-color: #FFF;
+    }
+    .scan * {
+      color: #212121;
+    }
+    .scan input.md-input {
+      color: #212121;
+    }
+  `,
+};
diff --git a/src/webview/recipe.js b/src/webview/recipe.js
index 3f2338b68..ddfd0e139 100644
--- a/src/webview/recipe.js
+++ b/src/webview/recipe.js
@@ -10,6 +10,7 @@ import {
 } from 'darkreader';
 
 import ignoreList from './darkmode/ignore';
+import customDarkModeCss from './darkmode/custom';
 
 import RecipeWebview from './lib/RecipeWebview';
 
@@ -42,6 +43,8 @@ class RecipeController {
     'get-service-id': 'serviceIdEcho',
   };
 
+  universalDarkModeInjected = false;
+
   constructor() {
     this.initialize();
   }
@@ -117,7 +120,7 @@ class RecipeController {
       }
     }
 
-    if (this.settings.service.isDarkModeEnabled || this.settings.app.darkMode) {
+    if (this.settings.service.isDarkModeEnabled) {
       debug('Enable dark mode');
 
       // Check if recipe has a darkmode.css
@@ -126,9 +129,12 @@ class RecipeController {
 
       if (darkModeExists) {
         injectDarkModeStyle(this.settings.service.recipe.path);
-      } else if (!ignoreList.includes(window.location.host)) {
+      } else if (this.settings.app.universalDarkMode && !ignoreList.includes(window.location.host)) {
         // Use darkreader instead
-        enableDarkMode();
+        enableDarkMode({}, {
+          css: customDarkModeCss[window.location.host] || '',
+        });
+        this.universalDarkModeInjected = true;
       }
     } else {
       debug('Remove dark mode');
@@ -137,8 +143,15 @@ class RecipeController {
         removeDarkModeStyle();
       } else {
         disableDarkMode();
+        this.universalDarkModeInjected = false;
       }
     }
+
+    // Remove dark reader if (universal) dark mode was just disabled
+    if (this.universalDarkModeInjected && (!this.settings.service.isDarkModeEnabled || !this.settings.app.universalDarkMode)) {
+      disableDarkMode();
+      this.universalDarkModeInjected = false;
+    }
   }
 
   updateAppSettings(event, data) {
diff --git a/src/webview/spellchecker.js b/src/webview/spellchecker.js
index 27380676d..1cb449110 100644
--- a/src/webview/spellchecker.js
+++ b/src/webview/spellchecker.js
@@ -96,7 +96,7 @@ export function isEnabled() {
 
 export function disable() {
   if (isEnabled()) {
-    webFrame.setSpellCheckProvider(currentDict, true, { spellCheck: () => true });
+    webFrame.setSpellCheckProvider(currentDict, { spellCheck: () => true });
     _isEnabled = false;
     currentDict = null;
   }