diff --git a/src/app.css b/src/app.css
index 2436780..36b57d3 100644
--- a/src/app.css
+++ b/src/app.css
@@ -46,6 +46,7 @@ html {
   background-size: 80%;
   background-repeat: repeat;
   background-blend-mode: overlay;
+  background-attachment: fixed;
 }
 
 .hackaburg {
diff --git a/src/lib/images/discord.svg b/src/lib/images/discord.svg
new file mode 100644
index 0000000..e98ff82
--- /dev/null
+++ b/src/lib/images/discord.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 800 800" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g transform="matrix(3.125,0,0,3.125,0,89.0625)">
+        <path d="M216.856,16.597C200.285,8.843 182.566,3.208 164.042,0C161.767,4.113 159.109,9.645 157.276,14.046C137.584,11.085 118.073,11.085 98.743,14.046C96.911,9.645 94.193,4.113 91.897,0C73.353,3.208 55.613,8.864 39.042,16.638C5.618,67.147 -3.443,116.401 1.087,164.956C23.256,181.511 44.74,191.568 65.862,198.149C71.077,190.971 75.728,183.341 79.735,175.3C72.104,172.401 64.795,168.822 57.889,164.668C59.721,163.311 61.513,161.891 63.245,160.431C105.367,180.133 151.135,180.133 192.755,160.431C194.506,161.891 196.298,163.311 198.11,164.668C191.184,168.843 183.855,172.421 176.224,175.321C180.23,183.341 184.862,190.992 190.097,198.169C211.239,191.588 232.743,181.532 254.912,164.956C260.228,108.668 245.831,59.866 216.856,16.597ZM85.474,135.095C72.829,135.095 62.459,123.29 62.459,108.915C62.459,94.54 72.608,82.715 85.474,82.715C98.341,82.715 108.71,94.519 108.489,108.915C108.509,123.29 98.341,135.095 85.474,135.095ZM170.525,135.095C157.88,135.095 147.511,123.29 147.511,108.915C147.511,94.54 157.659,82.715 170.525,82.715C183.392,82.715 193.761,94.519 193.54,108.915C193.54,123.29 183.392,135.095 170.525,135.095Z" style="fill:white;fill-rule:nonzero;"/>
+    </g>
+</svg>
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index fc92d58..c455d49 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -21,11 +21,11 @@
 <Nav />
 <div class="container mx-auto">
 	<Hero />
-	<Timeline />
-	<!-- <Schedule />
-		<Workshops />
+	<!-- <Timeline />-->
+	<Schedule />
+	<!-- 		<Workshops />
 		<Challenges />
-		<Hardware />
+		<Hardware />  
 -->
 	<Supporters />
 	<!--
diff --git a/src/routes/components/Button.svelte b/src/routes/components/Button.svelte
index 8bb6de7..db47f11 100644
--- a/src/routes/components/Button.svelte
+++ b/src/routes/components/Button.svelte
@@ -1,11 +1,16 @@
 <script lang="ts">
 	export let label: string;
+	export let type = 'default';
+	import discordIcon from '$lib/images/discord.svg';
 </script>
 
 <div class="relative group">
 	<button
-		class="glow relative bg-tungsten m-auto w-full mt-8 border-2 border-white rounded-3xl px-3 py-2 dark:text-black hover:cursor-pointer hover:bg-deadlydepth"
+		class="flex items-center gap-1 justify-center glow relative bg-tungsten m-auto w-full mt-8 border-2 border-white rounded-3xl px-3 py-2 dark:text-black hover:cursor-pointer hover:bg-deadlydepth"
 	>
 		{label}
+		{#if type === 'discord'}
+			<img class="h-5" src={discordIcon} alt="" />
+		{/if}
 	</button>
 </div>
diff --git a/src/routes/components/Event.svelte b/src/routes/components/Event.svelte
index 9391599..e427c7a 100644
--- a/src/routes/components/Event.svelte
+++ b/src/routes/components/Event.svelte
@@ -34,8 +34,8 @@
 
 		color: white;
 
-		background-color: #3fb28f50;
-		border-left: 3px solid #3fb28f;
+		background-color: #261f54;
+		border-left: 3px solid #ca70a2;
 		box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
 		border-radius: 2px;
 
@@ -69,7 +69,7 @@
 
 	.special {
 		color: white;
-		background-color: #3fb28f;
+		background-color: #ca70a2;
 	}
 
 	@media screen and (max-width: 766px) {
diff --git a/src/routes/components/Nav.svelte b/src/routes/components/Nav.svelte
index 1e8550c..87244bc 100644
--- a/src/routes/components/Nav.svelte
+++ b/src/routes/components/Nav.svelte
@@ -41,11 +41,11 @@
 					<a href="/" class="nav-element-base" aria-current="page">Home</a>
 				</li>
 				<li class="mt-2 hover:text-palevioletred">
-					<a href="/#timeline" class="nav-element-base">Timeline</a>
+					<a href="/#schedule" class="nav-element-base">Schedule</a>
 				</li>
 				<!--
 				<li class="mt-2 hover:text-palevioletred">
-					<a href="/#schedule" class="nav-element-base">Schedule</a>
+					<a href="/#timeline" class="nav-element-base">Timeline</a>
 				</li>
 				<li class="mt-2 hover:text-palevioletred">
 					<a href="/#workshops" class="nav-element-base">Workshops</a>
diff --git a/src/routes/components/Timetable.svelte b/src/routes/components/Timetable.svelte
index 25991b7..e8a5194 100644
--- a/src/routes/components/Timetable.svelte
+++ b/src/routes/components/Timetable.svelte
@@ -4,14 +4,13 @@
 
 <div class="TimeTableContainer">
 	<div class="HoursContainer">
-		<HourLine text="08:00" />
+		<HourLine text="00:00" />
 		<HourLine text="10:00" />
 		<HourLine text="12:00" />
 		<HourLine text="14:00" />
 		<HourLine text="16:00" />
 		<HourLine text="18:00" />
 		<HourLine text="20:00" />
-		<HourLine text="22:00" />
 	</div>
 	<div class="DaysContainer">
 		<slot />
diff --git a/src/routes/landing/Hero.svelte b/src/routes/landing/Hero.svelte
index a4042b9..4d80300 100644
--- a/src/routes/landing/Hero.svelte
+++ b/src/routes/landing/Hero.svelte
@@ -39,6 +39,11 @@
 						<Button label="Social Media" />
 					</a>
 				</div>
+				<div>
+					<a href="https://discord.gg/NF3DA2xghD" target="_blank" rel="noreferrer">
+						<Button label="Discord" type="discord" />
+					</a>
+				</div>
 			</div>
 		</div>
 	</div>
diff --git a/src/routes/landing/Schedule.svelte b/src/routes/landing/Schedule.svelte
index 7b890e9..7c4f348 100644
--- a/src/routes/landing/Schedule.svelte
+++ b/src/routes/landing/Schedule.svelte
@@ -6,77 +6,50 @@
 	import Event from '../components/Event.svelte';
 </script>
 
-<BaseComponent headline={'Schedule'} subHeadline={'When and what?'} id={'schedule'}>
+<BaseComponent headline={'Schedule'} subHeadline={''} id={'schedule'}>
 	<Timetable>
-		<Day date="Thu, 23.5.2024">
-			<Spacer hours={6} minutes={0} />
-			<Event hours={1} minutes={0} time="14:00 - 15:00" title="Registration" food />
-			<Event hours={1} minutes={45} time="15:15 - 17:00" title="Opening Ceremony">
-				<Event hours={0} minutes={20} time="16:00 - 16:20" title="Track Presentation" special />
+		<Day date="Thu, 22.5.2025">
+			<Spacer hours={5} minutes={30} />
+			<Event hours={1} minutes={30} time="13:30 - 15:00" title="Registration" food />
+			<Spacer hours={0} minutes={15} />
+			<Event hours={2} minutes={30} time="15:15 - 17:45" title="Opening Ceremony">
+				<Event hours={0} minutes={25} time="15:15 - 16:00" title="Getting Started" special />
+				<Event hours={0} minutes={25} time="16:00 - 16:15" title="Theme Announcement" special />
+				<Event hours={0} minutes={25} time="16:15 - 16:45" title="Partner & Sponsors" special />
 				<Event
 					hours={0}
-					minutes={20}
-					time="16:20 - 16:40"
-					title="Sponsor Challenge Pitches"
+					minutes={45}
+					time="17:00 - 17:45"
+					title="Idea Pitches & Group Building"
 					special
 				/>
-				<Event hours={0} minutes={25} time="16:40 - 17:00" title="Idea Pitches" special />
 			</Event>
-			<Event
-				hours={1}
-				minutes={0}
-				time="17:00 - 18:00"
-				title="Idea workshop: Find your team, work at your idea."
-				special
-			/>
+			<Spacer hours={0} minutes={15} />
 			<Event hours={1} minutes={0} time="18:00 - 19:00" title="Dinner" food />
-			<Event hours={4} minutes={30} time="19:00 - 24:00" title="Hacking begins">
-				<Spacer hours={4} minutes={0} />
+			<Event hours={2} minutes={0} time="19:00 - 24:00" title="Hacking">
+				<Spacer hours={1} minutes={25} />
 				<Event hours={0} minutes={30} time="01:30 - 02:00" title="Playtime" special />
 			</Event>
 		</Day>
-		<Day date="Fri, 24.5.2024">
-			<Event hours={15} minutes={20} time="00:00 - 24:00" title="Hacking">
-				<Spacer hours={0} minutes={15} />
-				<Event hours={0} minutes={45} time="09:00 - 10:00" title="Yoga for Hackers" special />
+		<Day date="Fri, 23.5.2025">
+			<Event hours={13} minutes={0} time="00:00 - 24:00" title="Hacking">
+				<Spacer hours={0} minutes={40} />
 				<Event hours={1} minutes={0} time="09:00 - 10:00" title="Breakfast" food />
-				<Event
-					hours={1}
-					minutes={0}
-					time="10:00 - 11:00"
-					title="Workshop (Zollner): AOI – Optimierung durch Automatisierung"
-					special
-				/>
-				<Spacer hours={0} minutes={30} />
-				<Event
-					hours={1}
-					minutes={0}
-					time="11:30 - 12:30"
-					title="Workshop (r_next): Urbane Datenplattform (UDP) + Standards: Schlüssel zur Smart City Regensburg"
-					special
-				/>
-				<Event hours={1} minutes={0} time="12:30 - 13:30" title="Lunch" food />
-
-				<Spacer hours={0} minutes={30} />
-				<Event
-					hours={1}
-					minutes={0}
-					time="14:00 - 15:00"
-					title="Workshop (Continental): Löt-Workshop"
-					special
-				/>
 
-				<Spacer hours={2} minutes={0} />
+				<Spacer hours={2} minutes={30} />
+				<Event hours={1} minutes={0} time="12:30 - 13:30" title="Lunch" food />
 
-				<Spacer hours={0} minutes={30} />
+				<Spacer hours={3} minutes={30} />
+				<Event hours={1} minutes={0} time="17:00 - 18:00" title="Presentation Workshop" special />
 				<Event hours={1} minutes={0} time="18:00 - 19:00" title="Dinner" food />
-				<Spacer hours={4} minutes={15} />
+
+				<Spacer hours={1} minutes={45} />
 				<Event hours={0} minutes={30} time="01:30 - 02:00" title="Playtime" special />
 			</Event>
 		</Day>
-		<Day date="Sat, 26.5.2024">
+		<Day date="Sat, 24.5.2025">
 			<Event hours={4} minutes={30} time="00:00 - 12:30" title="Hacking">
-				<Spacer hours={0} minutes={35} />
+				<Spacer hours={0} minutes={40} />
 				<Event hours={1} minutes={0} time="09:00 - 10:00" title="Breakfast" food />
 
 				<Spacer hours={1} minutes={30} />
@@ -96,12 +69,10 @@
 				special
 			/>
 			<Event hours={0} minutes={30} time="15:00 - 15:30" title="Finalist Preparation" special />
-
-			<Event hours={1} minutes={0} time="15:30 - 16:30" title="Final Pitches" special />
-			<Event hours={0} minutes={30} time="16:30 - 17:00" title="Jury selects winners" special />
+			<Event hours={1} minutes={0} time="15:30 - 16:30" title="Finalist Presentation" special />
+			<Event hours={0} minutes={30} time="16:30 - 17:00" title="Judging" special />
 			<Event hours={0} minutes={30} time="17:00 - 17:30" title="Award ceremony" special />
-
-			<Event hours={5} minutes={20} time="17:30 - open end" title="Afterparty" food />
+			<Event hours={3} minutes={20} time="17:30 - open end" title="Afterparty" special />
 		</Day>
 	</Timetable>
 	<!--div class="w-full flex mt-16 md:mt-32 flex-col md:flex-row">