diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/Preview.vue b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/Preview.vue
index 134ae95f0..ecd16bd21 100644
--- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/Preview.vue
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/Preview.vue
@@ -1,17 +1,18 @@
-<script setup lang="ts">
-import { computed, watch } from 'vue'
-import { useGlobalStore } from '../../../stores/Global'
-import { Codemirror } from 'vue-codemirror'
-import { json } from '@codemirror/lang-json'
-import RenderElements from './RenderElements.vue'
+<script lang="ts" setup>
+import { computed } from 'vue';
+import { useGlobalStore } from '../../../stores/Global';
+import RenderElements from './RenderElements.vue';
 import PriceDisplay from './PriceDisplay.vue';
-const globalStore = useGlobalStore()
+import type { PreviewResponse } from '../../../model/preview/types';
 
-const previewData = computed(() => globalStore.getPreviewData)
-const error = computed(() => globalStore.previewError)
-const isLoading = computed(() => globalStore.isPreviewLoading)
+const globalStore = useGlobalStore();
 
-const items = computed(() => previewData.value?.elements || [])
+const previewData = computed<PreviewResponse | null>(() => globalStore.getPreviewData);
+const error = computed(() => globalStore.previewError);
+const isLoading = computed(() => globalStore.isPreviewLoading);
+
+const items = computed(() => previewData.value?.elements || []);
+const price = computed(() => previewData.value);
 
 </script>
 
@@ -33,7 +34,7 @@ const items = computed(() => previewData.value?.elements || [])
               <RenderElements :items="items"/>
           </div>
           <div class="w-2/5 pl-6">
-            <PriceDisplay :tax="previewData.tax" :brutto="previewData.brutto" :netto="previewData.netto" />
+            <PriceDisplay :price-data="price" />
           </div>
         </div>
       </div>
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/PriceDisplay.vue b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/PriceDisplay.vue
index f62f670d9..757907302 100644
--- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/PriceDisplay.vue
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/PriceDisplay.vue
@@ -1,19 +1,18 @@
 <script setup lang="ts">
 import { computed } from 'vue';
+import type { PreviewResponse } from '../../../model/preview/types';
 
 const props = defineProps<{
-  netto: any;
-  tax: any;
-  brutto: any;
+  priceData: PreviewResponse | null;
 }>();
 
 const formatCurrency = (value: number) => {
   return new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(value);
 };
 
-const netPrice = computed(() => formatCurrency(props.netto/100 || 0));
-const tax = computed(() => formatCurrency(props.tax/100 || 0));
-const grossPrice = computed(() => formatCurrency(props.brutto/100 || 0));
+const netPrice = computed(() => formatCurrency(props.priceData?.netto / 100 || 0));
+const tax = computed(() => formatCurrency(props.priceData?.tax / 100 || 0));
+const grossPrice = computed(() => formatCurrency(props.priceData?.brutto / 100 || 0));
 
 </script>
 
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/RenderElements.vue b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/RenderElements.vue
index ba3fd2e0d..5716629e4 100644
--- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/RenderElements.vue
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/RenderElements.vue
@@ -1,38 +1,34 @@
 <script lang="ts" setup>
-import { computed } from 'vue';
-import TextElement from './elements/TextElement.vue'
-import InputElement from './elements/InputElement.vue'
-import HiddenElement from './elements/HiddenElement.vue'
-import HeadlineElement from './elements/HeadlineElement.vue'
-import SelectElement from './elements/SelectElement.vue'
+import { shallowRef } from 'vue';
+import type { Component } from 'vue';
+import type { PreviewElement } from '../../../model/preview/types';
+
+import TextElement from './elements/TextElement.vue';
+import InputElement from './elements/InputElement.vue';
+import HiddenElement from './elements/HiddenElement.vue';
+import HeadlineElement from './elements/HeadlineElement.vue';
+import SelectElement from './elements/SelectElement.vue';
 
 const props = defineProps<{
-    items: any
-}>()
+    items: PreviewElement[]
+}>();
+
+const componentMap: Record<string, Component> = shallowRef({
+  headline: HeadlineElement,
+  text: TextElement,
+  input: InputElement,
+  hidden: HiddenElement,
+  select: SelectElement,
+});
 
 </script>
 
 <template>
-    <div class="d-flex flex flex-col relative" v-for="item in items" v-if="items.length > 0" :key="item.uuid">
-         <HeadlineElement
-           v-if="item.valid && item.htmlType === 'headline'"
-           :item="item"
-          />
-         <HiddenElement
-           v-if="item.valid && item.htmlType === 'hidden'"
-           :item="item"
-          />
-         <InputElement
-           v-if="item.valid && item.htmlType === 'input'"
-           :item="item"
-          />
-         <TextElement
-           v-if="item.valid && item.htmlType === 'text'"
-           :item="item"
-          />
-         <SelectElement
-           v-if="item.valid && item.htmlType === 'select'"
-           :item="item"
-          />
+    <div v-for="item in items" :key="item.id">
+         <component 
+            v-if="item.valid && componentMap[item.htmlType]"
+            :is="componentMap[item.htmlType]" 
+            :item="item"
+         />
     </div>
-</template>
+</template>
\ No newline at end of file
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/elements/HeadlineElement.vue b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/elements/HeadlineElement.vue
index a4c199dce..96fdbbfaa 100644
--- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/elements/HeadlineElement.vue
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/elements/HeadlineElement.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup>
-import { computed } from 'vue';
+import type { PreviewElement } from '../../../../model/preview/types';
 
 const props = defineProps<{
-    item: any
+    item: PreviewElement
 }>()
 
 </script>
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/elements/HiddenElement.vue b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/elements/HiddenElement.vue
index 882940676..1a05284a7 100644
--- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/elements/HiddenElement.vue
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/elements/HiddenElement.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup>
-import { computed } from 'vue';
-import { Input } from '../../../../components/ui/input'
+import type { PreviewElement } from '../../../../model/preview/types';
+import { Input } from '../../../../components/ui/input';
 
 const props = defineProps<{
-    item: any
+    item: PreviewElement
 }>()
 
 
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/elements/InputElement.vue b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/elements/InputElement.vue
index 2912372e6..c68434aad 100644
--- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/elements/InputElement.vue
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/elements/InputElement.vue
@@ -1,13 +1,11 @@
 <script lang="ts" setup>
-import { computed } from 'vue';
-import { Input } from '../../../../components/ui/input'
-import { useGlobalStore } from '../../../../stores/Global'
+import type { PreviewElement } from '../../../../model/preview/types';
+import { Input } from '../../../../components/ui/input';
 
 const props = defineProps<{
-    item: any
+    item: PreviewElement
 }>()
 
-const globalStore = useGlobalStore()
 </script>
 
 
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/elements/SelectElement.vue b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/elements/SelectElement.vue
index f5cd65c20..8dbf299eb 100644
--- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/elements/SelectElement.vue
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/elements/SelectElement.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed } from 'vue'
+import type { PreviewElement } from '../../../../model/preview/types';
 import {
   Select,
   SelectContent,
@@ -7,10 +7,10 @@ import {
   SelectItem,
   SelectTrigger,
   SelectValue,
-} from '../../../../components/ui/select'
+} from '../../../../components/ui/select';
 
 const props = defineProps<{
-    item: any
+    item: PreviewElement
 }>()
 
 </script>
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/elements/TextElement.vue b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/elements/TextElement.vue
index 689ff530d..2c4b3d480 100644
--- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/elements/TextElement.vue
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/components/app/preview/elements/TextElement.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup>
-import { computed } from 'vue';
+import type { PreviewElement } from '../../../../model/preview/types';
 
 const props = defineProps<{
-    item: any
+    item: PreviewElement
 }>()
 
 </script>
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/model/preview/types.ts b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/model/preview/types.ts
new file mode 100644
index 000000000..81a8c1365
--- /dev/null
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/model/preview/types.ts
@@ -0,0 +1,38 @@
+export interface PreviewOption {
+  id: string;
+  name: string;
+  valid: boolean;
+  selected: boolean;
+}
+
+export interface PreviewElement {
+  id: string;
+  name: string;
+  pattern: string;
+  colorSystem: string;
+  placeHolder: string;
+  displayGroup: string;
+  defaultValue: string;
+  value: string;
+  help: string | null;
+  helpLink: string | null;
+  valid: boolean;
+  required: boolean;
+  rawValue: string;
+  rawValues: any[];
+  options: PreviewOption[];
+  htmlType: 'headline' | 'text' | 'input' | 'hidden' | 'select';
+  validationErrors: any[];
+  variant?: string; // For headline
+  minValue?: number; // For input
+  maxValue?: number; // For input
+}
+
+export interface PreviewResponse {
+  success: boolean;
+  netto: number;
+  tax: number;
+  brutto: number;
+  colorDb: any[];
+  elements: PreviewElement[];
+}
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/stores/Global.ts b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/stores/Global.ts
index 615e5721e..91b6fb49d 100644
--- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/stores/Global.ts
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/stores/Global.ts
@@ -1,6 +1,7 @@
 import { defineStore } from 'pinia'
 import BaseElement from '../model/BaseElement'
 import Mode from '../model/Mode'
+import type { PreviewResponse } from '../model/preview/types';
 import { saveProductToApi, saveFomulasAndParameterToApi, loadJsonFromApi, loadPriceFromApi, savePaperContainerToApi, saveDesignToApi, saveXmlToApi, fetchPreview } from '../lib/api'
 import { useItemStore } from './Items'
 
@@ -29,7 +30,7 @@ export const useGlobalStore = defineStore('global', {
     saving: false,
     syncing: false,
     currentTab: 'designer' as string | number,
-    previewData: {} as object,
+    previewData: null as PreviewResponse | null,
     isPreviewLoading: false,
     previewError: '',
   }),
@@ -44,7 +45,7 @@ export const useGlobalStore = defineStore('global', {
     getDragMode: (state) => state.dragMode,
     getFormulaData: (state) => state.formulaData,
     getFormulaError: (state) => state.formulaError,
-    getPreviewData: (state) => state.previewData,
+    getPreviewData: (state) => state.previewData as PreviewResponse | null,
   },
   actions: {
     setXml(value: string) {