diff --git a/changelog.d/themes3-fixes.fix b/changelog.d/themes3-fixes.fix
new file mode 100644
index 000000000..15c31e823
--- /dev/null
+++ b/changelog.d/themes3-fixes.fix
@@ -0,0 +1 @@
+fix color inputs and some in-development themes3 issues
diff --git a/src/App.scss b/src/App.scss
index 77d761dda..6e0aabcaa 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -14,14 +14,14 @@
   --ZI_navbar_popovers: 7500;
   --ZI_navbar: 7000;
   --ZI_popovers: 6000;
+
+  // Fallback for when stuff is loading
+  --background: var(--bg);
 }
 
 html {
   font-size: var(--font-size);
   // overflow-x: clip causes my browser's tab to crash with SIGILL lul
-
-  // Fallback for when stuff is loading
-  --background: var(--bg);
 }
 
 body {
@@ -410,6 +410,7 @@ nav {
   width: 100%;
   line-height: var(--__line-height);
   padding: var(--__vertical-gap) var(--__horizontal-gap);
+  background: transparent;
 
   --__line-height: 1.5em;
   --__horizontal-gap: 0.75em;
diff --git a/src/components/popover/popover.vue b/src/components/popover/popover.vue
index 0cc0949ce..0c5b372ee 100644
--- a/src/components/popover/popover.vue
+++ b/src/components/popover/popover.vue
@@ -71,6 +71,7 @@
   border-color: var(--border);
   border-style: solid;
   border-width: 1px;
+  background-color: var(--background);
 }
 
 .dropdown-menu {
@@ -82,6 +83,7 @@
   max-width: 100vw;
   z-index: var(--ZI_popover_override, var(--ZI_popovers));
   white-space: nowrap;
+  background-color: var(--background);
 
   .dropdown-divider {
     height: 0;
diff --git a/src/components/user_card/user_card.scss b/src/components/user_card/user_card.scss
index 90daaf7df..70a76d54c 100644
--- a/src/components/user_card/user_card.scss
+++ b/src/components/user_card/user_card.scss
@@ -204,6 +204,11 @@
 
     --emoji-size: 1.7em;
 
+    .RichContent {
+      /* stylelint-disable-next-line declaration-no-important */
+      --link: var(--text) !important;
+    }
+
     .top-line,
     .bottom-line {
       display: flex;
diff --git a/src/services/theme_data/theme2_keys.js b/src/services/theme_data/theme2_keys.js
index 69089e136..ffc5627c4 100644
--- a/src/services/theme_data/theme2_keys.js
+++ b/src/services/theme_data/theme2_keys.js
@@ -158,12 +158,12 @@ export default [
   'alertPopupNeutral',
   'alertPopupNeutralText',
 
-  'badgeNotification',
-  'badgeNotificationText',
-
   'badgeNeutral',
   'badgeNeutralText',
 
+  'badgeNotification',
+  'badgeNotificationText',
+
   'chatBg',
 
   'chatMessageIncomingBg',
diff --git a/src/services/theme_data/theme2_to_theme3.js b/src/services/theme_data/theme2_to_theme3.js
index e150369f2..6ea128369 100644
--- a/src/services/theme_data/theme2_to_theme3.js
+++ b/src/services/theme_data/theme2_to_theme3.js
@@ -517,6 +517,8 @@ export const convertTheme2To3 = (data) => {
       } else if (newRule.component === 'Badge') {
         if (newRule.variant === 'notification') {
           return [newRule, { component: 'Root', directives: { '--badgeNotification': 'color | ' + newRule.directives.background } }]
+        } else if (newRule.variant === 'neutral') {
+          return [{ ...newRule, variant: 'normal' }]
         } else {
           return [newRule]
         }