diff --git a/src/routes/rooms/+page.gql b/src/routes/rooms/+page.gql
new file mode 100644
index 0000000..50c8455
--- /dev/null
+++ b/src/routes/rooms/+page.gql
@@ -0,0 +1,12 @@
+query Rooms {
+	rooms {
+		name
+		seats
+		handicap
+		lab
+		placesWithSocket
+		exahm
+		seb
+		needsRequest
+	}
+}
diff --git a/src/routes/rooms/+page.server.js b/src/routes/rooms/+page.server.js
deleted file mode 100644
index 879f72f..0000000
--- a/src/routes/rooms/+page.server.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import { env } from '$env/dynamic/private';
-import { request, gql } from 'graphql-request';
-
-export async function load({ params }) {
-	const query = gql`
-		query {
-			rooms {
-				name
-				seats
-				handicap
-				lab
-				placesWithSocket
-				exahm
-				seb
-				needsRequest
-			}
-		}
-	`;
-
-	let data = await request(env.PLEXAMS_SERVER, query);
-
-	return {
-		rooms: data.rooms
-	};
-}
diff --git a/src/routes/rooms/+page.svelte b/src/routes/rooms/+page.svelte
index ce3892c..b85aa15 100644
--- a/src/routes/rooms/+page.svelte
+++ b/src/routes/rooms/+page.svelte
@@ -1,34 +1,38 @@
-<script>
-	export let data;
+<script lang="ts">
+	import type { PageData } from './$houdini';
+	export let data: PageData;
 
-	let rooms = data.rooms;
+	$: ({ Rooms } = data);
 
-	function onClick(column) {
+	let rooms: any = [];
+	$: rooms = $Rooms?.data?.rooms || [];
+
+	function onClick(column: any) {
 		if (column === 'nta') {
-			rooms = data.rooms.filter((r) => r.handicap);
+			rooms = $Rooms?.data?.rooms.filter((r) => r.handicap);
 		} else if (column === 'lab') {
-			rooms = data.rooms.filter((r) => r.lab);
+			rooms = $Rooms?.data?.rooms.filter((r) => r.lab);
 		} else if (column === 'placesWithSocket') {
-			rooms = data.rooms.filter((r) => r.placesWithSocket);
+			rooms = $Rooms?.data?.rooms.filter((r) => r.placesWithSocket);
 		} else if (column === 'exahm') {
-			rooms = data.rooms.filter((r) => r.exahm);
+			rooms = $Rooms?.data?.rooms.filter((r) => r.exahm);
 		} else if (column === 'seb') {
-			rooms = data.rooms.filter((r) => r.seb);
+			rooms = $Rooms?.data?.rooms.filter((r) => r.seb);
 		} else if (column === 'needsRequest') {
-			rooms = data.rooms.filter((r) => r.needsRequest);
+			rooms = $Rooms?.data?.rooms.filter((r) => r.needsRequest);
 		} else if (column === 'seats') {
-			rooms = data.rooms;
-			rooms.sort((r1, r2) => r2.seats - r1.seats);
+			rooms = $Rooms?.data?.rooms;
+			rooms?.sort((r1: any, r2: any) => r2.seats - r1.seats);
 		} else if (column === 'name') {
-			rooms = data.rooms;
-			rooms.sort((r1, r2) => r1.name.localeCompare(r2.name));
+			rooms = $Rooms?.data?.rooms;
+			rooms?.sort((r1: any, r2: any) => r1.name.localeCompare(r2.name));
 		}
 	}
 </script>
 
 <div class="text-center m-2">
 	<div class="text-4xl text-center mt-8 uppercase">
-		{data.rooms.length} Räume
+		{rooms.length} Räume
 	</div>
 </div>