diff --git a/amplify/data/resource.ts b/amplify/data/resource.ts
index 6113bb8d..6a8a38fd 100644
--- a/amplify/data/resource.ts
+++ b/amplify/data/resource.ts
@@ -167,6 +167,23 @@ const schema = a
         allow.ownerDefinedIn('owner').to(['update', 'delete', 'read', 'create']),
         allow.guest().to(['read']),
       ]),
+
+    StoreTemplate: a
+      .model({
+        storeId: a.string().required(),
+        domain: a.string().required(),
+        templateKey: a.string().required(),
+        templateData: a.json().required(),
+        isActive: a.boolean().required(),
+        lastUpdated: a.datetime(),
+        owner: a.string().required(),
+      })
+      .identifier(['storeId'])
+      .secondaryIndexes(index => [index('domain')])
+      .authorization(allow => [
+        allow.ownerDefinedIn('owner').to(['update', 'delete', 'read', 'create']),
+        allow.guest().to(['read']),
+      ]),
   })
   .authorization(allow => [
     allow.resource(postConfirmation),
diff --git a/app/(setup-layout)/first-steps/page.tsx b/app/(setup-layout)/first-steps/page.tsx
index 012d3148..aeed1c8f 100644
--- a/app/(setup-layout)/first-steps/page.tsx
+++ b/app/(setup-layout)/first-steps/page.tsx
@@ -34,10 +34,10 @@ export default function FirstStepsPage() {
       <div className="min-h-screen flex items-center justify-center">
         <MultiStepLoader
           loadingStates={[
-            { text: 'Configurando tu tienda' },
             { text: 'Creando tu tienda' },
-            { text: 'Configurando tu tienda' },
-            { text: 'Listo' },
+            { text: 'Configurando template engine' },
+            { text: 'Preparando tu tienda online' },
+            { text: '¡Listo para usar!' },
           ]}
           loading={true}
         />
diff --git a/next.config.ts b/next.config.js
similarity index 89%
rename from next.config.ts
rename to next.config.js
index 37add973..d3977e80 100644
--- a/next.config.ts
+++ b/next.config.js
@@ -1,11 +1,12 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
+ 
+  // Configure domains for image optimization
   images: {
     remotePatterns: [
       {
         protocol: 'https',
         hostname: 'images.unsplash.com',
-        port: '',
         pathname: '/**',
       },
       {
@@ -15,24 +16,20 @@ const nextConfig = {
       {
         protocol: 'https',
         hostname: '*.s3.amazonaws.com',
-        port: '',
         pathname: '/**',
       },
       {
         protocol: 'https',
         hostname: '*.s3.*.amazonaws.com',
-        port: '',
         pathname: '/**',
       },
       {
         protocol: 'https',
         hostname: 'd1etr7t5j9fzio.cloudfront.net',
-        port: '',
       },
       {
         protocol: 'https',
         hostname: '*cdn.fasttify.com',
-        port: '',
         pathname: '/**',
       },
     ],
diff --git a/package-lock.json b/package-lock.json
index 06debb03..a0874cdf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -46,6 +46,7 @@
         "framer-motion": "^12.0.5",
         "gsap": "^3.12.7",
         "input-otp": "^1.4.2",
+        "liquidjs": "^10.21.1",
         "lottie-react": "^2.4.1",
         "lucide-react": "^0.471.2",
         "motion": "^11.18.2",
@@ -40534,6 +40535,35 @@
         "node": ">= 14"
       }
     },
+    "node_modules/liquidjs": {
+      "version": "10.21.1",
+      "resolved": "https://registry.npmjs.org/liquidjs/-/liquidjs-10.21.1.tgz",
+      "integrity": "sha512-NZXmCwv3RG5nire3fmIn9HsOyJX3vo+ptp0yaXUHAMzSNBhx74Hm+dAGJvscUA6lNqbLuYfXgNavRQ9UbUJhQQ==",
+      "license": "MIT",
+      "dependencies": {
+        "commander": "^10.0.0"
+      },
+      "bin": {
+        "liquid": "bin/liquid.js",
+        "liquidjs": "bin/liquid.js"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/liquidjs"
+      }
+    },
+    "node_modules/liquidjs/node_modules/commander": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
+      "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "node_modules/listr2": {
       "version": "8.3.3",
       "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.3.3.tgz",
diff --git a/package.json b/package.json
index 02614c5e..5afdbe72 100644
--- a/package.json
+++ b/package.json
@@ -56,6 +56,7 @@
     "framer-motion": "^12.0.5",
     "gsap": "^3.12.7",
     "input-otp": "^1.4.2",
+    "liquidjs": "^10.21.1",
     "lottie-react": "^2.4.1",
     "lucide-react": "^0.471.2",
     "motion": "^11.18.2",