diff --git a/content/tweaks/badges.js b/content/tweaks/badges.js
index d32322a..e99b462 100644
--- a/content/tweaks/badges.js
+++ b/content/tweaks/badges.js
@@ -5,20 +5,10 @@
   let darkModeObserver = null;
   let currentSettings = null;
 
-  function isDarkMode(settings) {
-    if (settings.darkMode === "light") return false;
-    if (settings.darkMode === "dark") return true;
-    return document.body.classList.contains("res-nightmode");
-  }
-
-  function getColorPrefix(settings) {
-    return isDarkMode(settings) ? "dark" : "light";
-  }
-
   function applyColorsToContainer(container, settings, subredditName) {
-    const prefix = getColorPrefix(settings);
+    const prefix = window.RedditTweaks.getColorPrefix(settings);
 
-    if (isDarkMode(settings)) {
+    if (window.RedditTweaks.isDarkMode(settings)) {
       container.classList.add("rt-dark");
     } else {
       container.classList.remove("rt-dark");
@@ -173,7 +163,7 @@
   window.RedditTweaks.badgeTweak = {
     apply: apply,
     updateColors: updateColors,
-    isDarkMode: isDarkMode,
-    getColorPrefix: getColorPrefix,
+    isDarkMode: window.RedditTweaks.isDarkMode,
+    getColorPrefix: window.RedditTweaks.getColorPrefix,
   };
 })();
diff --git a/content/tweaks/color-popover.js b/content/tweaks/color-popover.js
index f7c8a7a..dc264f8 100644
--- a/content/tweaks/color-popover.js
+++ b/content/tweaks/color-popover.js
@@ -15,8 +15,8 @@
 
   function getHelpers() {
     return {
-      isDarkMode: window.RedditTweaks.badgeTweak.isDarkMode,
-      getColorPrefix: window.RedditTweaks.badgeTweak.getColorPrefix,
+      isDarkMode: window.RedditTweaks.isDarkMode,
+      getColorPrefix: window.RedditTweaks.getColorPrefix,
     };
   }
 
diff --git a/lib/settings.js b/lib/settings.js
index 26e29bc..e824b49 100644
--- a/lib/settings.js
+++ b/lib/settings.js
@@ -18,6 +18,10 @@
     "dark.commentsTextColor": "#cccccc",
     subredditColors: {},
     colorPresets: [],
+    badgeLayout: true,
+    cardLayout: true,
+    cardBackground: "reddit",
+    cardGap: 16,
   };
 
   function migrateSubredditColors(colors) {
@@ -60,9 +64,21 @@
     await browser.storage.local.clear();
   }
 
+  function isDarkMode(settings) {
+    if (settings.darkMode === "light") return false;
+    if (settings.darkMode === "dark") return true;
+    return document.body.classList.contains("res-nightmode");
+  }
+
+  function getColorPrefix(settings) {
+    return isDarkMode(settings) ? "dark" : "light";
+  }
+
   window.RedditTweaks = window.RedditTweaks || {};
   window.RedditTweaks.DEFAULTS = DEFAULTS;
   window.RedditTweaks.loadSettings = loadSettings;
   window.RedditTweaks.saveSettings = saveSettings;
   window.RedditTweaks.resetSettings = resetSettings;
+  window.RedditTweaks.isDarkMode = isDarkMode;
+  window.RedditTweaks.getColorPrefix = getColorPrefix;
 })();