diff --git a/CHANGELOG.md b/CHANGELOG.md
index af3441a..924f74a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,7 +21,7 @@ a flexibility update.
   normal "most recent" page).
 - new: css variables for increasing line spacing/paragraph margins.
 - new: patch the notion:// url scheme/protocol to work on linux.
-- new: menu shows theme conflicts.
+- new: menu shows theme conflicts + a core mod option to auto-resolve theme conflicts.
 - improved: menu will now respect integrated titlebar setting.
 - improved: use keyup listeners instead of a globalShortcut for the enhancements menu toggle.
 - bugfix: removed messenger emoji set as the provider no longer supports it.
@@ -55,12 +55,12 @@ a fork of notion-deb-builder that does generate an app.asar has been created and
 
 // todo
 
-- new: a core mod option to auto-resolve theme conflicts.
 - bugfix: night shift working on macOS.
 - bugfix: windows are properly hidden/shown on macOS.
-- extension: "tweaks" = common layout changes.
+- extension: "tweaks" = common style/layout changes.
 - new: a `-n` cli option.
 - improved: overwrite `app.asar.bak` if already exists.
+- improved: additionally menu item descriptions on hover.
 
 ### v0.9.1 (2020-09-26)
 
diff --git a/mods/core/enhancerMenu.js b/mods/core/enhancerMenu.js
index 37e8642..aacb52e 100644
--- a/mods/core/enhancerMenu.js
+++ b/mods/core/enhancerMenu.js
@@ -542,6 +542,27 @@ window['__start'] = async () => {
         ].enabled
           ? 'enabled'
           : 'disabled';
+        if (
+          $enable.checked &&
+          coreStore().autoresolve &&
+          mod.tags.includes('theme')
+        ) {
+          modules.loaded.forEach((other) => {
+            const $other_enable = other.elem.querySelector(
+              `#enable_${other.id}`
+            );
+            if (
+              other !== mod &&
+              $other_enable &&
+              $other_enable.checked &&
+              other.tags.includes('theme')
+            ) {
+              for (let mode of ['dark', 'light'])
+                if (other.tags.includes(mode) && mod.tags.includes(mode))
+                  $other_enable.click();
+            }
+          });
+        }
         search();
         modified();
       });
diff --git a/mods/core/mod.js b/mods/core/mod.js
index 1d3bd3f..869160e 100644
--- a/mods/core/mod.js
+++ b/mods/core/mod.js
@@ -14,6 +14,12 @@ module.exports = {
   version: require('../../package.json').version,
   author: 'dragonwocky',
   options: [
+    {
+      key: 'autoresolve',
+      label: 'auto-resolve theme conflicts',
+      type: 'toggle',
+      value: false,
+    },
     {
       key: 'openhidden',
       label: 'hide app on open',