diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index c2cc0e2..acb1c44 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -5,6 +5,7 @@ const websiteName = 'Template'
 const websiteDescription = 'This is just a template.'
 
 import Background from '../templates/components/Background/Background'
+import OptimizeBackground from '../templates/components/Optimizer/OptimizeBackground'
 ---
 
 <html lang="en">
@@ -18,16 +19,17 @@ import Background from '../templates/components/Background/Background'
   </head>
 
   <body id="body">
-    <Background image />
+    <!-- <OptimizeBackground /> -->
+    <Background color="#0c1b31" />
     <slot />
+
+    <style lang="sass">
+      @use '/src/styles/variables.sass' as vars
+      @use '/src/styles/fonts.sass' as fonts
+
+      #body
+        font-family: fonts.$Inter
+        color: vars.$textColor
+    </style>
   </body>
 </html>
-
-<style lang="sass">
-  @use '/src/styles/variables.sass' as vars
-  @use '/src/styles/fonts.sass' as fonts
-
-  #body
-    font-family: fonts.$Inter
-    color: vars.$textColor
-</style>
diff --git a/src/pages/index.astro b/src/pages/index.astro
index a30725d..7a2a55b 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -1,16 +1,18 @@
 ---
 import Layout from '../layouts/Layout.astro'
-import Button from '../templates/Button/Button.tsx'
-import Image from '../templates/Image/Image'
-import Link from '../templates/Link/Link'
-import Counter from '../components/Counter/Counter.tsx'
-import Page from '../templates/Page/Page'
+import Button from '../templates/components/Button/Button'
+import Logo from '../templates/components/Logo/Logo'
+import OptimizeLogo from '../templates/components/Optimizer/OptimizeLogo'
+import Link from '../templates/components/Link/Link'
+import Counter from '../components/Counter/Counter'
+import Page from '../templates/components/Page/Page'
 ---
 
 <Layout title="FWT">
   <Page alignment="column">
     <Link to="https://git.patalcala.com/patalcala9/fwt">
-      <Image src="fwt.png" size={250} />
+      <!-- <OptimizeLogo size={250} /> -->
+      <Logo size={250} />
     </Link>
 
     <h1>Fast WebApp Template</h1>
diff --git a/src/pages/next.astro b/src/pages/next.astro
index ac757c9..e6c1c0f 100644
--- a/src/pages/next.astro
+++ b/src/pages/next.astro
@@ -1,8 +1,8 @@
 ---
 import Layout from '../layouts/Layout.astro'
-import Button from '../templates/Button/Button.tsx'
-import Image from '../templates/Image/Image'
-import Page from '../templates/Page/Page'
+import Button from '../templates/components/Button/Button.tsx'
+import Image from '../templates/components/Image/Image'
+import Page from '../templates/components/Page/Page'
 ---
 
 <Layout title="Home">
