diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index bfd3102930..2539577fb1 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -78,7 +78,7 @@
     "@spectrum-css/underlay": "^2.0.9",
     "@spectrum-css/vars": "^3.0.1",
     "dayjs": "^1.10.4",
-    "svelte-flatpickr": "^3.1.0",
+    "svelte-flatpickr": "^3.2.3",
     "svelte-portal": "^1.0.0"
   },
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
diff --git a/packages/bbui/src/Form/Core/DatePicker.svelte b/packages/bbui/src/Form/Core/DatePicker.svelte
index 2516cb659d..176db9f497 100644
--- a/packages/bbui/src/Form/Core/DatePicker.svelte
+++ b/packages/bbui/src/Form/Core/DatePicker.svelte
@@ -26,6 +26,7 @@
     altFormat: enableTime ? "F j Y, H:i" : "F j, Y",
     wrap: true,
     appendTo,
+    disableMobile: "true",
   }
 
   const handleChange = event => {
diff --git a/packages/bbui/yarn.lock b/packages/bbui/yarn.lock
index a3b20aa862..a492c83266 100644
--- a/packages/bbui/yarn.lock
+++ b/packages/bbui/yarn.lock
@@ -2415,10 +2415,10 @@ supports-color@^7.0.0, supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
-svelte-flatpickr@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/svelte-flatpickr/-/svelte-flatpickr-3.1.0.tgz#ad83588430dbd55196a1a258b8ba27e7f9c1ee37"
-  integrity sha512-zKyV+ukeVuJ8CW0Ing3T19VSekc4bPkou/5Riutt1yATrLvSsanNqcgqi7Q5IePvIoOF9GJ5OtHvn1qK9Wx9BQ==
+svelte-flatpickr@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/svelte-flatpickr/-/svelte-flatpickr-3.2.3.tgz#db5dd7ad832ef83262b45e09737955ad3d591fc8"
+  integrity sha512-PNkqK4Napx8nTvCwkaUXdnKo8dISThaxEOK+szTUXcY6H0dQM0TSyuoMaVWY2yX7pM+PN5cpCQCcVe8YvTRFSw==
   dependencies:
     flatpickr "^4.5.2"
 
diff --git a/packages/builder/src/components/design/AppPreview/ThemeEditor.svelte b/packages/builder/src/components/design/AppPreview/ThemeEditor.svelte
index ac70fb9b29..7b36de4fa8 100644
--- a/packages/builder/src/components/design/AppPreview/ThemeEditor.svelte
+++ b/packages/builder/src/components/design/AppPreview/ThemeEditor.svelte
@@ -84,7 +84,7 @@
         </div>
       </div>
       <div class="setting">
-        <Label size="L">Primary color</Label>
+        <Label size="L">Accent color</Label>
         <ColorPicker
           spectrumTheme={$store.theme}
           value={$store.customTheme?.primaryColor || defaultTheme.primaryColor}
@@ -92,7 +92,7 @@
         />
       </div>
       <div class="setting">
-        <Label size="L">Primary color (hover)</Label>
+        <Label size="L">Accent color (hover)</Label>
         <ColorPicker
           spectrumTheme={$store.theme}
           value={$store.customTheme?.primaryColorHover ||
diff --git a/packages/builder/src/components/upgrade/UpgradeModal.svelte b/packages/builder/src/components/upgrade/UpgradeModal.svelte
index 84fd3bee97..7571e6d773 100644
--- a/packages/builder/src/components/upgrade/UpgradeModal.svelte
+++ b/packages/builder/src/components/upgrade/UpgradeModal.svelte
@@ -25,9 +25,9 @@
     title="Self-host Budibase"
     confirmText="Self-host Budibase"
   >
-    <span
-      >Self-host budibase for free to get unlimited apps and more - and it only
-      takes a few minutes!</span
-    >
+    <span>
+      Self-host budibase for free to get unlimited apps and more - and it only
+      takes a few minutes!
+    </span>
   </ModalContent>
 </Modal>