diff --git a/lib/themes/flowrift/Page_ not_found1/index.html b/lib/themes/flowrift/NotFound1/index.html
similarity index 73%
rename from lib/themes/flowrift/Page_ not_found1/index.html
rename to lib/themes/flowrift/NotFound1/index.html
index 5cf682f7..20a53a33 100644
--- a/lib/themes/flowrift/Page_ not_found1/index.html	
+++ b/lib/themes/flowrift/NotFound1/index.html
@@ -31,24 +31,7 @@ <h1 class="mb-2 text-center text-2xl font-bold text-gray-800 md:text-3xl">Page n
 
       <a
         href="#"
-        class="
-          inline-block
-          rounded-lg
-          bg-gray-200
-          px-8
-          py-3
-          text-center text-sm
-          font-semibold
-          text-gray-500
-          outline-none
-          ring-indigo-300
-          transition
-          duration-100
-          hover:bg-gray-300
-          focus-visible:ring
-          active:text-gray-700
-          md:text-base
-        "
+        class="inline-block rounded-lg bg-gray-200 px-8 py-3 text-center text-sm font-semibold text-gray-500 outline-none ring-indigo-300 transition duration-100 hover:bg-gray-300 focus-visible:ring active:text-gray-700 md:text-base"
         >Go home</a
       >
     </div>
diff --git a/lib/themes/flowrift/Page_ not_found1/index.tsx b/lib/themes/flowrift/NotFound1/index.tsx
similarity index 100%
rename from lib/themes/flowrift/Page_ not_found1/index.tsx
rename to lib/themes/flowrift/NotFound1/index.tsx
diff --git a/lib/themes/flowrift/Page_ not_found1/preview.png b/lib/themes/flowrift/NotFound1/preview.png
similarity index 100%
rename from lib/themes/flowrift/Page_ not_found1/preview.png
rename to lib/themes/flowrift/NotFound1/preview.png
diff --git a/lib/themes/flowrift/Page_ not_found2/index.html b/lib/themes/flowrift/NotFound2/index.html
similarity index 64%
rename from lib/themes/flowrift/Page_ not_found2/index.html
rename to lib/themes/flowrift/NotFound2/index.html
index ae0a84be..7b226ea7 100644
--- a/lib/themes/flowrift/Page_ not_found2/index.html	
+++ b/lib/themes/flowrift/NotFound2/index.html
@@ -4,34 +4,13 @@
       <!-- content - start -->
       <div class="flex flex-col items-center justify-center sm:items-start md:py-24 lg:py-32">
         <p class="mb-4 text-sm font-semibold uppercase text-indigo-500 md:text-base">Error 404</p>
-        <h1 class="mb-2 text-center text-2xl font-bold text-gray-800 sm:text-left md:text-3xl">
-          Page not found
-        </h1>
+        <h1 class="mb-2 text-center text-2xl font-bold text-gray-800 sm:text-left md:text-3xl">Page not found</h1>
 
-        <p class="mb-8 text-center text-gray-500 sm:text-left md:text-lg">
-          The page you’re looking for doesn’t exist.
-        </p>
+        <p class="mb-8 text-center text-gray-500 sm:text-left md:text-lg">The page you’re looking for doesn’t exist.</p>
 
         <a
           href="#"
-          class="
-            inline-block
-            rounded-lg
-            bg-gray-200
-            px-8
-            py-3
-            text-center text-sm
-            font-semibold
-            text-gray-500
-            outline-none
-            ring-indigo-300
-            transition
-            duration-100
-            hover:bg-gray-300
-            focus-visible:ring
-            active:text-gray-700
-            md:text-base
-          "
+          class="inline-block rounded-lg bg-gray-200 px-8 py-3 text-center text-sm font-semibold text-gray-500 outline-none ring-indigo-300 transition duration-100 hover:bg-gray-300 focus-visible:ring active:text-gray-700 md:text-base"
           >Go home</a
         >
       </div>
diff --git a/lib/themes/flowrift/Page_ not_found2/index.tsx b/lib/themes/flowrift/NotFound2/index.tsx
similarity index 100%
rename from lib/themes/flowrift/Page_ not_found2/index.tsx
rename to lib/themes/flowrift/NotFound2/index.tsx
diff --git a/lib/themes/flowrift/Page_ not_found2/preview.png b/lib/themes/flowrift/NotFound2/preview.png
similarity index 100%
rename from lib/themes/flowrift/Page_ not_found2/preview.png
rename to lib/themes/flowrift/NotFound2/preview.png
diff --git a/lib/themes/flowrift/NotFound3/index.html b/lib/themes/flowrift/NotFound3/index.html
new file mode 100644
index 00000000..c85c8a76
--- /dev/null
+++ b/lib/themes/flowrift/NotFound3/index.html
@@ -0,0 +1,31 @@
+<div class="bg-white py-6 sm:py-0">
+  <div class="mx-auto max-w-screen-xl px-4 md:px-8">
+    <div class="grid gap-8 sm:grid-cols-2 sm:gap-12">
+      <!-- image - start -->
+      <div class="h-80 overflow-hidden rounded-lg bg-gray-100 shadow-lg sm:rounded-none sm:shadow-none md:h-auto">
+        <img
+          src="https://images.unsplash.com/photo-1452022449339-59005948ec5b?auto=format&q=75&fit=crop&w=600"
+          loading="lazy"
+          alt="Photo by Jeremy Cai"
+          class="h-full w-full object-cover object-center"
+        />
+      </div>
+      <!-- image - end -->
+
+      <!-- content - start -->
+      <div class="flex flex-col items-center justify-center sm:items-start md:py-24 lg:py-32 xl:py-64">
+        <p class="mb-4 text-sm font-semibold uppercase text-indigo-500 md:text-base">Error 404</p>
+        <h1 class="mb-2 text-center text-2xl font-bold text-gray-800 sm:text-left md:text-3xl">Page not found</h1>
+
+        <p class="mb-8 text-center text-gray-500 sm:text-left md:text-lg">The page you’re looking for doesn’t exist.</p>
+
+        <a
+          href="#"
+          class="inline-block rounded-lg bg-gray-200 px-8 py-3 text-center text-sm font-semibold text-gray-500 outline-none ring-indigo-300 transition duration-100 hover:bg-gray-300 focus-visible:ring active:text-gray-700 md:text-base"
+          >Go home</a
+        >
+      </div>
+      <!-- content - end -->
+    </div>
+  </div>
+</div>
diff --git a/lib/themes/flowrift/Page_ not_found3/index.tsx b/lib/themes/flowrift/NotFound3/index.tsx
similarity index 100%
rename from lib/themes/flowrift/Page_ not_found3/index.tsx
rename to lib/themes/flowrift/NotFound3/index.tsx
diff --git a/lib/themes/flowrift/Page_ not_found3/preview.png b/lib/themes/flowrift/NotFound3/preview.png
similarity index 100%
rename from lib/themes/flowrift/Page_ not_found3/preview.png
rename to lib/themes/flowrift/NotFound3/preview.png
diff --git a/lib/themes/flowrift/NotFound4/index.html b/lib/themes/flowrift/NotFound4/index.html
new file mode 100644
index 00000000..f150f1f6
--- /dev/null
+++ b/lib/themes/flowrift/NotFound4/index.html
@@ -0,0 +1,28 @@
+<div class="bg-white py-6 sm:py-8 lg:py-12">
+  <div class="mx-auto max-w-screen-2xl px-4 md:px-8">
+    <div
+      class="relative mx-auto flex h-96 w-full items-center justify-center overflow-hidden rounded-lg bg-gray-100 shadow-lg sm:w-96"
+    >
+      <img
+        src="https://images.unsplash.com/photo-1530651788726-1dbf58eeef1f?auto=format&q=75&fit=crop&w=600"
+        loading="lazy"
+        alt="Photo by Connor Botts"
+        class="absolute inset-0 h-full w-full object-cover object-center"
+      />
+
+      <!-- content - start -->
+      <div class="relative flex flex-col items-center justify-center p-8 md:p-16">
+        <h1 class="mb-2 text-center text-2xl font-bold text-white md:text-3xl lg:text-4xl">404</h1>
+
+        <p class="mb-8 text-center text-gray-200 md:text-lg">The page you’re looking for doesn’t exist.</p>
+
+        <a
+          href="#"
+          class="inline-block rounded-lg bg-gray-200 px-8 py-3 text-center text-sm font-semibold text-gray-500 outline-none ring-indigo-300 transition duration-100 hover:bg-gray-300 focus-visible:ring active:text-gray-700 md:text-base"
+          >Go home</a
+        >
+      </div>
+      <!-- content - end -->
+    </div>
+  </div>
+</div>
diff --git a/lib/themes/flowrift/Page_ not_found4/index.tsx b/lib/themes/flowrift/NotFound4/index.tsx
similarity index 100%
rename from lib/themes/flowrift/Page_ not_found4/index.tsx
rename to lib/themes/flowrift/NotFound4/index.tsx
diff --git a/lib/themes/flowrift/Page_ not_found4/preview.png b/lib/themes/flowrift/NotFound4/preview.png
similarity index 100%
rename from lib/themes/flowrift/Page_ not_found4/preview.png
rename to lib/themes/flowrift/NotFound4/preview.png
diff --git a/lib/themes/flowrift/Page_ not_found5/index.html b/lib/themes/flowrift/NotFound5/index.html
similarity index 62%
rename from lib/themes/flowrift/Page_ not_found5/index.html
rename to lib/themes/flowrift/NotFound5/index.html
index 4ce69da9..9af4d92d 100644
--- a/lib/themes/flowrift/Page_ not_found5/index.html	
+++ b/lib/themes/flowrift/NotFound5/index.html
@@ -15,9 +15,7 @@
       <!-- content - start -->
       <div class="flex flex-col items-center justify-center sm:items-start md:py-24 lg:py-32">
         <p class="mb-4 text-sm font-semibold uppercase text-indigo-500 md:text-base">Error 404</p>
-        <h1 class="mb-2 text-center text-2xl font-bold text-gray-800 sm:text-left md:text-3xl">
-          Page not found
-        </h1>
+        <h1 class="mb-2 text-center text-2xl font-bold text-gray-800 sm:text-left md:text-3xl">Page not found</h1>
 
         <p class="mb-4 text-center text-gray-500 sm:text-left md:mb-8 md:text-lg">
           The page you’re looking for doesn’t exist.
@@ -27,15 +25,7 @@ <h1 class="mb-2 text-center text-2xl font-bold text-gray-800 sm:text-left md:tex
           <div>
             <a
               href="#"
-              class="
-                inline-block
-                text-sm text-indigo-500
-                transition
-                duration-100
-                hover:text-indigo-600
-                active:text-indigo-700
-                md:text-base
-              "
+              class="inline-block text-sm text-indigo-500 transition duration-100 hover:text-indigo-600 active:text-indigo-700 md:text-base"
               >Home</a
             >
           </div>
@@ -43,15 +33,7 @@ <h1 class="mb-2 text-center text-2xl font-bold text-gray-800 sm:text-left md:tex
           <div>
             <a
               href="#"
-              class="
-                inline-block
-                text-sm text-indigo-500
-                transition
-                duration-100
-                hover:text-indigo-600
-                active:text-indigo-700
-                md:text-base
-              "
+              class="inline-block text-sm text-indigo-500 transition duration-100 hover:text-indigo-600 active:text-indigo-700 md:text-base"
               >Search</a
             >
           </div>
@@ -59,15 +41,7 @@ <h1 class="mb-2 text-center text-2xl font-bold text-gray-800 sm:text-left md:tex
           <div>
             <a
               href="#"
-              class="
-                inline-block
-                text-sm text-indigo-500
-                transition
-                duration-100
-                hover:text-indigo-600
-                active:text-indigo-700
-                md:text-base
-              "
+              class="inline-block text-sm text-indigo-500 transition duration-100 hover:text-indigo-600 active:text-indigo-700 md:text-base"
               >Help</a
             >
           </div>
diff --git a/lib/themes/flowrift/Page_ not_found5/index.tsx b/lib/themes/flowrift/NotFound5/index.tsx
similarity index 100%
rename from lib/themes/flowrift/Page_ not_found5/index.tsx
rename to lib/themes/flowrift/NotFound5/index.tsx
diff --git a/lib/themes/flowrift/Page_ not_found5/preview.png b/lib/themes/flowrift/NotFound5/preview.png
similarity index 100%
rename from lib/themes/flowrift/Page_ not_found5/preview.png
rename to lib/themes/flowrift/NotFound5/preview.png
diff --git a/lib/themes/flowrift/Page_ not_found3/index.html b/lib/themes/flowrift/Page_ not_found3/index.html
deleted file mode 100644
index e3a180a6..00000000
--- a/lib/themes/flowrift/Page_ not_found3/index.html	
+++ /dev/null
@@ -1,65 +0,0 @@
-<div class="bg-white py-6 sm:py-0">
-  <div class="mx-auto max-w-screen-xl px-4 md:px-8">
-    <div class="grid gap-8 sm:grid-cols-2 sm:gap-12">
-      <!-- image - start -->
-      <div
-        class="
-          h-80
-          overflow-hidden
-          rounded-lg
-          bg-gray-100
-          shadow-lg
-          sm:rounded-none
-          sm:shadow-none
-          md:h-auto
-        "
-      >
-        <img
-          src="https://images.unsplash.com/photo-1452022449339-59005948ec5b?auto=format&q=75&fit=crop&w=600"
-          loading="lazy"
-          alt="Photo by Jeremy Cai"
-          class="h-full w-full object-cover object-center"
-        />
-      </div>
-      <!-- image - end -->
-
-      <!-- content - start -->
-      <div
-        class="flex flex-col items-center justify-center sm:items-start md:py-24 lg:py-32 xl:py-64"
-      >
-        <p class="mb-4 text-sm font-semibold uppercase text-indigo-500 md:text-base">Error 404</p>
-        <h1 class="mb-2 text-center text-2xl font-bold text-gray-800 sm:text-left md:text-3xl">
-          Page not found
-        </h1>
-
-        <p class="mb-8 text-center text-gray-500 sm:text-left md:text-lg">
-          The page you’re looking for doesn’t exist.
-        </p>
-
-        <a
-          href="#"
-          class="
-            inline-block
-            rounded-lg
-            bg-gray-200
-            px-8
-            py-3
-            text-center text-sm
-            font-semibold
-            text-gray-500
-            outline-none
-            ring-indigo-300
-            transition
-            duration-100
-            hover:bg-gray-300
-            focus-visible:ring
-            active:text-gray-700
-            md:text-base
-          "
-          >Go home</a
-        >
-      </div>
-      <!-- content - end -->
-    </div>
-  </div>
-</div>
diff --git a/lib/themes/flowrift/Page_ not_found4/index.html b/lib/themes/flowrift/Page_ not_found4/index.html
deleted file mode 100644
index fb12f2d5..00000000
--- a/lib/themes/flowrift/Page_ not_found4/index.html	
+++ /dev/null
@@ -1,60 +0,0 @@
-<div class="bg-white py-6 sm:py-8 lg:py-12">
-  <div class="mx-auto max-w-screen-2xl px-4 md:px-8">
-    <div
-      class="
-        relative
-        mx-auto
-        flex
-        h-96
-        w-full
-        items-center
-        justify-center
-        overflow-hidden
-        rounded-lg
-        bg-gray-100
-        shadow-lg
-        sm:w-96
-      "
-    >
-      <img
-        src="https://images.unsplash.com/photo-1530651788726-1dbf58eeef1f?auto=format&q=75&fit=crop&w=600"
-        loading="lazy"
-        alt="Photo by Connor Botts"
-        class="absolute inset-0 h-full w-full object-cover object-center"
-      />
-
-      <!-- content - start -->
-      <div class="relative flex flex-col items-center justify-center p-8 md:p-16">
-        <h1 class="mb-2 text-center text-2xl font-bold text-white md:text-3xl lg:text-4xl">404</h1>
-
-        <p class="mb-8 text-center text-gray-200 md:text-lg">
-          The page you’re looking for doesn’t exist.
-        </p>
-
-        <a
-          href="#"
-          class="
-            inline-block
-            rounded-lg
-            bg-gray-200
-            px-8
-            py-3
-            text-center text-sm
-            font-semibold
-            text-gray-500
-            outline-none
-            ring-indigo-300
-            transition
-            duration-100
-            hover:bg-gray-300
-            focus-visible:ring
-            active:text-gray-700
-            md:text-base
-          "
-          >Go home</a
-        >
-      </div>
-      <!-- content - end -->
-    </div>
-  </div>
-</div>
diff --git a/lib/themes/flowrift/index.ts b/lib/themes/flowrift/index.ts
index 4bdd0e2d..f24c38e8 100644
--- a/lib/themes/flowrift/index.ts
+++ b/lib/themes/flowrift/index.ts
@@ -72,11 +72,11 @@ import Product5 from './Product5'
 import Heading1 from './Heading1'
 import Heading2 from './Heading2'
 import Heading3 from './Heading3'
-import PageNotFound1 from './Page_ not_found1'
-import PageNotFound2 from './Page_ not_found2'
-import PageNotFound3 from './Page_ not_found3'
-import PageNotFound4 from './Page_ not_found4'
-import PageNotFound5 from './Page_ not_found5'
+import PageNotFound1 from './NotFound1'
+import PageNotFound2 from './NotFound2'
+import PageNotFound3 from './NotFound3'
+import PageNotFound4 from './NotFound4'
+import PageNotFound5 from './NotFound5'
 
 const components = {
   Banner1,