diff --git a/apps/ottabase-template-app-nextjs-homepage/app/theme-demo/page.tsx b/apps/ottabase-template-app-nextjs-homepage/app/theme-demo/page.tsx
index fb410f3ce..31e2587a0 100644
--- a/apps/ottabase-template-app-nextjs-homepage/app/theme-demo/page.tsx
+++ b/apps/ottabase-template-app-nextjs-homepage/app/theme-demo/page.tsx
@@ -31,7 +31,7 @@ export default function ThemeDemo() {
                     </Button>
                 </div>
 
-                <h1 className="font-heading text-4xl font-bold text-foreground">Theme Demo: {config.themeBase}</h1>
+                <h1 className="font-heading text-4xl font-bold text-foreground">Theme Demo: {config.theme.name}</h1>
 
                 {/* Typography Demo */}
                 <section className="space-y-4 rounded-lg border border-border bg-card p-6">
diff --git a/apps/ottabase-template-app-nextjs-homepage/next-env.d.ts b/apps/ottabase-template-app-nextjs-homepage/next-env.d.ts
index 9edff1c7c..c4b7818fb 100644
--- a/apps/ottabase-template-app-nextjs-homepage/next-env.d.ts
+++ b/apps/ottabase-template-app-nextjs-homepage/next-env.d.ts
@@ -1,6 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import "./.next/types/routes.d.ts";
+import "./.next/dev/types/routes.d.ts";
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
diff --git a/packages/ottalanding/src/ottaorm-models/LandingSection.ts b/packages/ottalanding/src/ottaorm-models/LandingSection.ts
index ab0ec040f..1c445ef27 100644
--- a/packages/ottalanding/src/ottaorm-models/LandingSection.ts
+++ b/packages/ottalanding/src/ottaorm-models/LandingSection.ts
@@ -64,7 +64,7 @@ export class LandingSection extends BaseModel {
             formConfig: {
                 visible: true,
                 fieldType: 'select',
-                options: SECTION_TYPES.map((t) => ({ label: t, value: t })),
+                options: SECTION_TYPES.map((t) => ({ id: t, name: t, label: t, value: t })),
             },
             tableConfig: { visible: true, colWidth: 150 },
         },
diff --git a/packages/ottalanding/src/section-fields.ts b/packages/ottalanding/src/section-fields.ts
index 758d463bf..a953265e1 100644
--- a/packages/ottalanding/src/section-fields.ts
+++ b/packages/ottalanding/src/section-fields.ts
@@ -125,9 +125,9 @@ const featuresFields: ModelFields = {
             visible: true,
             fieldType: 'select',
             options: [
-                { label: '2 columns', value: '2' },
-                { label: '3 columns', value: '3' },
-                { label: '4 columns', value: '4' },
+                { id: '2', name: '2 columns', label: '2 columns', value: '2' },
+                { id: '3', name: '3 columns', label: '3 columns', value: '3' },
+                { id: '4', name: '4 columns', label: '4 columns', value: '4' },
             ],
             order: 4,
         },
@@ -173,8 +173,8 @@ const pricingFields: ModelFields = {
             visible: true,
             fieldType: 'select',
             options: [
-                { label: 'Monthly', value: 'monthly' },
-                { label: 'Annual', value: 'annual' },
+                { id: 'monthly', name: 'Monthly', label: 'Monthly', value: 'monthly' },
+                { id: 'annual', name: 'Annual', label: 'Annual', value: 'annual' },
             ],
             order: 4,
         },
@@ -401,8 +401,8 @@ const featureHighlightFields: ModelFields = {
             visible: true,
             fieldType: 'select',
             options: [
-                { label: 'Right', value: 'right' },
-                { label: 'Left', value: 'left' },
+                { id: 'right', name: 'Right', label: 'Right', value: 'right' },
+                { id: 'left', name: 'Left', label: 'Left', value: 'left' },
             ],
             order: 4,
         },