diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index 025392c..c1f9ca2 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -1,5 +1,6 @@
 ---
-import '../../styles/main.scss';
+import '@styles/main.scss';
+import Theme from '@components/Theme/Theme.svelte';
 ---
 <!doctype html>
 <html lang="en">
@@ -12,7 +13,9 @@ import '../../styles/main.scss';
 		<title>Proving Ground</title>
 	</head>
 	<body>
-		<slot />
+		<Theme>
+			<slot />
+		</Theme>
 	</body>
 </html>
 
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 90fa205..a5f236a 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -5,7 +5,7 @@ import ScrollerAnimate from '@components/ScrollerAnimate/ScrollerAnimate.svelte'
 import Article from '@components/Article/Article.svelte';
 import BodyText from '@components/BodyText/BodyText.svelte';
 import Headline from '@components/Headline/Headline.svelte';
-import Theme from '@components/Theme/Theme.svelte';
+
 
 import graphicOne from '../assets/Photo-3468.jpg';
 import graphicTwo from '../assets/Photo-3471.jpg';
@@ -31,21 +31,21 @@ const graphics = await Promise.all([
 ---
 
 <Layout>
-  <Theme>
-    <Headline
-      hed={'Proving Ground'}
-      dek="Hello, there!"
-      hedSize="bigger"
+
+  <Headline
+    hed={'Proving Ground'}
+    dek="Hello, there!"
+    hedSize="bigger"
+  />
+  <Article>
+    <BodyText text="Cras eu consectetur justo, eu luctus felis. Suspendisse lectus enim, bibendum vitae euismod et, condimentum quis tortor. Donec sit amet orci nibh. Vivamus facilisis nunc quis nunc feugiat placerat. Nunc ut augue vitae metus fermentum venenatis vel at dui. Nulla aliquet nibh porttitor odio imperdiet, in ullamcorper augue bibendum. Cras ornare nunc ut sollicitudin egestas. Suspendisse neque ipsum, faucibus eu hendrerit porttitor, tincidunt a tortor. Aliquam at facilisis diam, a ullamcorper lacus. Suspendisse pharetra faucibus venenatis. Donec efficitur condimentum neque ut vehicula." />
+    <ScrollerAnimate
+      client:only="svelte"
+      {graphics}
+      
+      backgroundWidth="normal"
     />
-    <Article>
-      <BodyText text="Cras eu consectetur justo, eu luctus felis. Suspendisse lectus enim, bibendum vitae euismod et, condimentum quis tortor. Donec sit amet orci nibh. Vivamus facilisis nunc quis nunc feugiat placerat. Nunc ut augue vitae metus fermentum venenatis vel at dui. Nulla aliquet nibh porttitor odio imperdiet, in ullamcorper augue bibendum. Cras ornare nunc ut sollicitudin egestas. Suspendisse neque ipsum, faucibus eu hendrerit porttitor, tincidunt a tortor. Aliquam at facilisis diam, a ullamcorper lacus. Suspendisse pharetra faucibus venenatis. Donec efficitur condimentum neque ut vehicula." />
-      <ScrollerAnimate
-        client:only="svelte"
-        {graphics}
-        
-        backgroundWidth="normal"
-      />
-      <BodyText text="Sed feugiat, lacus id elementum tristique, urna elit consectetur mauris, in commodo ipsum neque sed turpis. Ut elit ex, pharetra laoreet leo vitae, rhoncus condimentum ligula. Morbi et sagittis tellus. Proin sed felis euismod ipsum lacinia feugiat. Donec finibus pretium dignissim. Integer ornare egestas scelerisque. Donec purus elit, viverra vitae felis at, volutpat sollicitudin tellus. Vivamus fermentum dictum dapibus. Phasellus non ligula ac augue efficitur ultrices sit amet at quam. Fusce dapibus luctus ex, non semper massa commodo eget." />
+    <BodyText text="Sed feugiat, lacus id elementum tristique, urna elit consectetur mauris, in commodo ipsum neque sed turpis. Ut elit ex, pharetra laoreet leo vitae, rhoncus condimentum ligula. Morbi et sagittis tellus. Proin sed felis euismod ipsum lacinia feugiat. Donec finibus pretium dignissim. Integer ornare egestas scelerisque. Donec purus elit, viverra vitae felis at, volutpat sollicitudin tellus. Vivamus fermentum dictum dapibus. Phasellus non ligula ac augue efficitur ultrices sit amet at quam. Fusce dapibus luctus ex, non semper massa commodo eget." />
     </Article>
-  </Theme>
+
 </Layout>
diff --git a/tsconfig.json b/tsconfig.json
index d3572ac..c939e55 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -5,7 +5,7 @@
       "@assets/*": ["./src/assets/*"],
       "@components/*": ["./src/components/*"],
       "@lib/*": ["./src/lib/*"],
-      "../../styles/*": ["./src/styles/*"],
+      "@styles/*": ["./src/styles/*"],
       "@utils/*": ["./src/utils/*"]
     }
   },
