diff --git a/apps/website/screens/theme-generator/ThemeGeneratorPage.tsx b/apps/website/screens/theme-generator/ThemeGeneratorPage.tsx
index a2d9df2e0..73ae5f689 100644
--- a/apps/website/screens/theme-generator/ThemeGeneratorPage.tsx
+++ b/apps/website/screens/theme-generator/ThemeGeneratorPage.tsx
@@ -11,6 +11,8 @@ import {
 import Link from "next/link";
 import LandingCards from "./components/LandingCards";
 import LandingSteps from "./components/LandingSteps";
+import landingImage from "./images/theme-generator-landing-bg.png";
+import landingImageFlipped from "./images/theme-generator-landing-bg-flipped.png";
 
 const steps = [
   {
@@ -58,7 +60,7 @@ const ThemeGeneratorPage = () => {
         width="100%"
         boxSizing="border-box"
         background={{
-          image: "url(/theme-generator-landing-bg.png)",
+          image: `url(${landingImage.src})`,
           position: "0px 50%",
           size: "cover",
         }}
@@ -114,7 +116,7 @@ const ThemeGeneratorPage = () => {
         width="100%"
         boxSizing="border-box"
         background={{
-          image: "url(/theme-generator-landing-bg-flipped.png)",
+          image: `url(${landingImageFlipped.src})`,
           size: "cover",
         }}
         height="329px"
diff --git a/apps/website/public/theme-generator-landing-bg-flipped.png b/apps/website/screens/theme-generator/images/theme-generator-landing-bg-flipped.png
similarity index 100%
rename from apps/website/public/theme-generator-landing-bg-flipped.png
rename to apps/website/screens/theme-generator/images/theme-generator-landing-bg-flipped.png
diff --git a/apps/website/public/theme-generator-landing-bg.png b/apps/website/screens/theme-generator/images/theme-generator-landing-bg.png
similarity index 100%
rename from apps/website/public/theme-generator-landing-bg.png
rename to apps/website/screens/theme-generator/images/theme-generator-landing-bg.png
diff --git a/apps/website/screens/theme-generator/utils.ts b/apps/website/screens/theme-generator/utils.ts
index e9830f8bf..3cbcc2ba4 100644
--- a/apps/website/screens/theme-generator/utils.ts
+++ b/apps/website/screens/theme-generator/utils.ts
@@ -97,7 +97,7 @@ export const handleExport = (themeJson: string) => {
   const dataStr = "data:text/json;charset=utf-8," + encodeURIComponent(themeJson);
   const downloadAnchorNode = document.createElement("a");
   downloadAnchorNode.setAttribute("href", dataStr);
-  downloadAnchorNode.setAttribute("download", "halstack-theme-tokens.json");
+  downloadAnchorNode.setAttribute("download", "halstack-theme.json");
   document.body.appendChild(downloadAnchorNode);
   downloadAnchorNode.click();
   downloadAnchorNode.remove();