diff --git a/client/components/open/forms/OpenForm.vue b/client/components/open/forms/OpenForm.vue
index 3ddf92bd..826f780d 100644
--- a/client/components/open/forms/OpenForm.vue
+++ b/client/components/open/forms/OpenForm.vue
@@ -130,6 +130,7 @@ import OpenFormField from './OpenFormField.vue'
 import {pendingSubmission} from "~/composables/forms/pendingSubmission.js"
 import FormLogicPropertyResolver from "~/lib/forms/FormLogicPropertyResolver.js"
 import {computed} from "vue"
+import CachedDefaultTheme from "~/lib/forms/themes/CachedDefaultTheme.js"
 
 export default {
   name: 'OpenForm',
@@ -140,9 +141,14 @@ export default {
       required: true
     },
     theme: {
-      type: Object,
-      required: true
-    },
+    type: Object, default: () => {
+      const theme = inject("theme", null)
+      if (theme) {
+        return theme.value
+      }
+      return CachedDefaultTheme.getInstance()
+    }
+  },
     loading: {
       type: Boolean,
       required: true
diff --git a/client/components/pages/forms/show/UrlFormPrefill.vue b/client/components/pages/forms/show/UrlFormPrefill.vue
index 1851a8d7..44e43030 100644
--- a/client/components/pages/forms/show/UrlFormPrefill.vue
+++ b/client/components/pages/forms/show/UrlFormPrefill.vue
@@ -107,9 +107,9 @@
 </template>
 
 <script>
+import ThemeBuilder from "~/lib/forms/themes/ThemeBuilder"
 import FormUrlPrefill from "../../../open/forms/components/FormUrlPrefill.vue"
 import OpenForm from "../../../open/forms/OpenForm.vue"
-import { themes } from "~/lib/forms/themes/form-themes.js"
 
 export default {
   name: "UrlFormPrefill",
@@ -121,11 +121,17 @@ export default {
 
   data: () => ({
     prefillFormData: null,
-    theme: themes.default,
     showUrlFormPrefillModal: false,
   }),
 
-  computed: {},
+  computed: {
+    theme () {
+      return new ThemeBuilder(this.form.theme, {
+        size: this.form.size,
+        borderRadius: this.form.border_radius
+      }).getAllComponents()
+    },
+  },
 
   methods: {
     generateUrl(formData) {