diff --git a/src/components/ProjectCard.astro b/src/components/ProjectCard.astro
new file mode 100644
index 0000000..f0ae6b0
--- /dev/null
+++ b/src/components/ProjectCard.astro
@@ -0,0 +1,40 @@
+---
+interface Props {
+    title: string;
+    description: string;
+    link?: string;
+    repository?: string;
+}
+
+const {title, description, link, repository} = Astro.props;
+
+import ButtonLink from "./Button.astro";
+import Card from "./Card.astro";
+---
+
+<Card title={title}>
+    <p class="mb-3 flex-1">{description}</p>
+    <slot />
+    <div class="flex flex-wrap gap-2">
+        {
+            link &&
+                <ButtonLink link={link}>
+                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="w-5 h-5">
+                        <path fill-rule="evenodd"
+                              d="M15.75 2.25H21a.75.75 0 0 1 .75.75v5.25a.75.75 0 0 1-1.5 0V4.81L8.03 17.03a.75.75 0 0 1-1.06-1.06L19.19 3.75h-3.44a.75.75 0 0 1 0-1.5Zm-10.5 4.5a1.5 1.5 0 0 0-1.5 1.5v10.5a1.5 1.5 0 0 0 1.5 1.5h10.5a1.5 1.5 0 0 0 1.5-1.5V10.5a.75.75 0 0 1 1.5 0v8.25a3 3 0 0 1-3 3H5.25a3 3 0 0 1-3-3V8.25a3 3 0 0 1 3-3h8.25a.75.75 0 0 1 0 1.5H5.25Z"
+                              clip-rule="evenodd"/>
+                    </svg>
+                    Go to Site
+                </ButtonLink>
+        }
+        {
+            repository &&
+                <ButtonLink link={repository}>
+                    <svg class="w-5 h-5" viewBox="0 0 98 96" xmlns="http://www.w3.org/2000/svg">
+                        <path fill-rule="evenodd" clip-rule="evenodd" d="M48.854 0C21.839 0 0 22 0 49.217c0 21.756 13.993 40.172 33.405 46.69 2.427.49 3.316-1.059 3.316-2.362 0-1.141-.08-5.052-.08-9.127-13.59 2.934-16.42-5.867-16.42-5.867-2.184-5.704-5.42-7.17-5.42-7.17-4.448-3.015.324-3.015.324-3.015 4.934.326 7.523 5.052 7.523 5.052 4.367 7.496 11.404 5.378 14.235 4.074.404-3.178 1.699-5.378 3.074-6.6-10.839-1.141-22.243-5.378-22.243-24.283 0-5.378 1.94-9.778 5.014-13.2-.485-1.222-2.184-6.275.486-13.038 0 0 4.125-1.304 13.426 5.052a46.97 46.97 0 0 1 12.214-1.63c4.125 0 8.33.571 12.213 1.63 9.302-6.356 13.427-5.052 13.427-5.052 2.67 6.763.97 11.816.485 13.038 3.155 3.422 5.015 7.822 5.015 13.2 0 18.905-11.404 23.06-22.324 24.283 1.78 1.548 3.316 4.481 3.316 9.126 0 6.6-.08 11.897-.08 13.526 0 1.304.89 2.853 3.316 2.364 19.412-6.52 33.405-24.935 33.405-46.691C97.707 22 75.788 0 48.854 0z" fill="currentColor"></path>
+                    </svg>
+                    GitHub
+                </ButtonLink>
+        }
+    </div>
+</Card>
\ No newline at end of file
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index b137a88..51357ce 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -55,7 +55,7 @@ const { title } = Astro.props;
 		</header>
 		<slot />
 		<footer class="p-2 bg-base-300 text-center">
-			<p>&copy; Mia Rose Winter 2024</p>
+			<p>&copy; Mia Rose Winter 2024 &dash; 2026</p>
 		</footer>
 	</body>
 </html>
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 2432f76..0f332a1 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -2,59 +2,44 @@
 import Layout from '../layouts/Layout.astro';
 import Card from "../components/Card.astro";
 import ButtonLink from "../components/Button.astro";
+import ProjectCard from "../components/ProjectCard.astro";
 ---
 
 <Layout title="Winter Software">
 	<main class="container mx-auto p-4 md:px-12">
-		<p class="bg-primary text-primary-content p-8 text-lg rounded-sm font-bold text-center">
+		<!---
+        <p class="bg-primary text-primary-content p-8 text-lg rounded-sm font-bold text-center">
 			Still under Construction, but have some projects.
 		</p>
+        -->
 
 		<h1 class="my-3 lg:text-5xl text-3xl font-medium">Winter Software</h1>
-		<p class="mb-8">Some text would go here</p>
+		<p class="mb-8">
+            A collection of Projects from and by
+            <a class="underline" href="https://miawinter.de" target="_blank">Mia Rose Winter</a>
+        </p>
 
 		<h2 class="text-2xl lg:text-4xl font-medium mb-2">Projects</h2>
-		<div class="columns-md gap-8 space-y-4 mb-8">
-			<Card title="Wave">
-				<p class="mb-3 flex-1">
-					The Collaborative Open Source Blogging Engine
-				</p>
-				<div class="flex flex-wrap gap-2">
-					<ButtonLink link="https://github.com/miawinter98/Wave">
-						<svg class="w-5 h-5" viewBox="0 0 98 96" xmlns="http://www.w3.org/2000/svg">
-							<path fill-rule="evenodd" clip-rule="evenodd" d="M48.854 0C21.839 0 0 22 0 49.217c0 21.756 13.993 40.172 33.405 46.69 2.427.49 3.316-1.059 3.316-2.362 0-1.141-.08-5.052-.08-9.127-13.59 2.934-16.42-5.867-16.42-5.867-2.184-5.704-5.42-7.17-5.42-7.17-4.448-3.015.324-3.015.324-3.015 4.934.326 7.523 5.052 7.523 5.052 4.367 7.496 11.404 5.378 14.235 4.074.404-3.178 1.699-5.378 3.074-6.6-10.839-1.141-22.243-5.378-22.243-24.283 0-5.378 1.94-9.778 5.014-13.2-.485-1.222-2.184-6.275.486-13.038 0 0 4.125-1.304 13.426 5.052a46.97 46.97 0 0 1 12.214-1.63c4.125 0 8.33.571 12.213 1.63 9.302-6.356 13.427-5.052 13.427-5.052 2.67 6.763.97 11.816.485 13.038 3.155 3.422 5.015 7.822 5.015 13.2 0 18.905-11.404 23.06-22.324 24.283 1.78 1.548 3.316 4.481 3.316 9.126 0 6.6-.08 11.897-.08 13.526 0 1.304.89 2.853 3.316 2.364 19.412-6.52 33.405-24.935 33.405-46.691C97.707 22 75.788 0 48.854 0z" fill="currentColor"></path>
-						</svg>
-						GitHub
-					</ButtonLink>
-					<ButtonLink link="https://git.winter-software.com/winter-software/Wave" type="secondary">
-						<svg class="w-5 h-5" viewBox="0 0 212 212" xmlns="http://www.w3.org/2000/svg">
-							<g transform="translate(6,6)">
-								<path d="M58 168 v-98 a50 50 0 0 1 50-50 h20" stroke-width="25" stroke="#ff6600" fill="none" />
-								<path d="M58 168 v-30 a50 50 0 0 1 50-50 h20" stroke-width="25" stroke="#d40000" fill="none" />
-								<circle cx="142" cy="20" r="18" stroke-width="15" stroke="#ff6600" fill="none" />
-								<circle cx="142" cy="88" r="18" stroke-width="15" stroke="#d40000" fill="none" />
-								<circle cx="58" cy="180" r="18" stroke-width="15" stroke="#d40000" fill="none" />
-							</g>
-						</svg>
-						Forgejo
-					</ButtonLink>
-				</div>
-			</Card>
-			<Card title="Wave Alpha">
-				<p class="mb-3 flex-1">
-					A blog running Wave, maintained by Mia Rose Winter, with many articles about many topics from many people.
-				</p>
-				<ButtonLink link="https://blog.winter-software.com">
-					<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="w-5 h-5">
-						<path fill-rule="evenodd" d="M15.75 2.25H21a.75.75 0 0 1 .75.75v5.25a.75.75 0 0 1-1.5 0V4.81L8.03 17.03a.75.75 0 0 1-1.06-1.06L19.19 3.75h-3.44a.75.75 0 0 1 0-1.5Zm-10.5 4.5a1.5 1.5 0 0 0-1.5 1.5v10.5a1.5 1.5 0 0 0 1.5 1.5h10.5a1.5 1.5 0 0 0 1.5-1.5V10.5a.75.75 0 0 1 1.5 0v8.25a3 3 0 0 1-3 3H5.25a3 3 0 0 1-3-3V8.25a3 3 0 0 1 3-3h8.25a.75.75 0 0 1 0 1.5H5.25Z" clip-rule="evenodd" />
-					</svg>
-					Go to Site
-				</ButtonLink>
-			</Card>
-			<Card title="Asilifelis">
-				<p class="flex-1">coming soon*</p>
-				<p class="text-end"><small>*if soon means in like the next 5 years</small></p>
-			</Card>
+		<div class="grid grid-cols-1 xl:grid-cols-3 gap-8 gap-y-4 mb-8">
+            <ProjectCard title="GeeksList"
+                         description="Keep track of your favorite shows"
+                         link="https://geekslist.de" />
+            <ProjectCard title="Wave"
+                         description="The Collaborative Open Source Blogging Engine"
+                         repository="https://github.com/miawinter98/Wave" />
+            <ProjectCard title="Wave Alpha"
+                         description="A blog running Wave, maintained by Mia Rose Winter, with many articles about many topics from many people."
+                         link="https://blog.winter-software.com" />
+            <ProjectCard title="Just Short It!"
+                         description="The most KISS single-user URL shortener there is"
+                         repository="https://github.com/miawinter98/just-short-it" />
+            <ProjectCard title="image-gallery"
+                         description="Create a simple image gallery using Github Pages"
+                         link="https://miawinter98.github.io/image-gallery/"
+                         repository="https://github.com/miawinter98/image-gallery" />
+            <ProjectCard title="Asilifelis" description="coming soon*">
+                <p class="text-end"><small>*if soon means in like the next <span class="line-through">5</span> 10 years</small></p>
+            </ProjectCard>
 		</div>
 	</main>
 </Layout>