diff --git a/astro.config.mjs b/astro.config.mjs
index 8dd067e0..97ddeaa7 100644
--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -21,6 +21,9 @@ export default defineConfig({
         "#": fileURLToPath(new URL("./src", import.meta.url))
       }
     },
+		ssr: {
+			noExternal: ["@pdfme/generator", "@pdfme/common", "@pdfme/schemas"]
+		},
     build: {
       commonjsOptions: {
         transformMixedEsModules: false
diff --git a/src/components/Dashboard/DashboardAusweis.svelte b/src/components/Dashboard/DashboardAusweis.svelte
index d62040b8..aa6572e6 100644
--- a/src/components/Dashboard/DashboardAusweis.svelte
+++ b/src/components/Dashboard/DashboardAusweis.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import {
 	VerbrauchsausweisWohnenClient,
-	} from "#components/Ausweis/types";
+	} from "#components/Ausweis/types.js";
 	import moment from "moment";
 	import { dialogs } from "svelte-dialogs";
 	import {
@@ -11,8 +11,8 @@
 		Pencil2,
 		QuestionMarkCircled,
 	} from "radix-svelte-icons";
-	import { endEnergieVerbrauchVerbrauchsausweis_2016 } from "#lib/Berechnungen/VerbrauchsausweisWohnen/VerbrauchsausweisWohnen_2016";
-	import { client } from "src/trpc";
+	import { endEnergieVerbrauchVerbrauchsausweis_2016 } from "#lib/Berechnungen/VerbrauchsausweisWohnen/VerbrauchsausweisWohnen_2016.js";
+	import { client } from "src/trpc.js";
 		
 	export let ausweis: VerbrauchsausweisWohnenClient;
 	export let progress: number;
@@ -167,7 +167,7 @@
 		{/await}
 		<div class="card-actions justify-end mt-8">
 			<a class="btn btn-primary" href="/energieausweis-erstellen/verbrauchsausweis-wohnen?uid={ausweis.uid}">Bearbeiten</a>
-			<a class="btn btn-ghost" title="PDF Herunterladen" target="_blank" href="/pdf/ansichtsausweis?ausweis_uid={ausweis.uid}">
+			<a class="btn btn-ghost" title="PDF Herunterladen" target="_blank" href="/pdf/ansichtsausweis?uid={ausweis.uid}">
 				<Download size={22} />
 			</a>
 		</div>
diff --git a/src/components/Notifications/Notification.svelte b/src/components/Notifications/Notification.svelte
index d14a8837..77273008 100644
--- a/src/components/Notifications/Notification.svelte
+++ b/src/components/Notifications/Notification.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import RawNotification from "./RawNotification.svelte";
-import { Notification } from "./shared";
+import { Notification } from "./shared.js";
 
 	export let notification: Notification & { uid: string };
 </script>
diff --git a/src/components/Notifications/NotificationWrapper.svelte b/src/components/Notifications/NotificationWrapper.svelte
index fda211bc..3ced2ee1 100644
--- a/src/components/Notifications/NotificationWrapper.svelte
+++ b/src/components/Notifications/NotificationWrapper.svelte
@@ -2,7 +2,7 @@
 	import Notification from "./Notification.svelte";
 	import RawNotificationWrapper from "./RawNotificationWrapper.svelte";
 
-	import { notifications } from "./shared";
+	import { notifications } from "./shared.js";
 </script>
 
 <RawNotificationWrapper>
diff --git a/src/components/Notifications/RawNotification.svelte b/src/components/Notifications/RawNotification.svelte
index f156b583..7f24c7de 100644
--- a/src/components/Notifications/RawNotification.svelte
+++ b/src/components/Notifications/RawNotification.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { Notification, deleteNotification } from "./shared";
+	import { Notification, deleteNotification } from "./shared.js";
 	import { fly } from "svelte/transition";
 
 	export let notification: Partial<Notification> & { uid: string };
diff --git a/src/components/Notifications/index.ts b/src/components/Notifications/index.ts
new file mode 100644
index 00000000..e0fb06ed
--- /dev/null
+++ b/src/components/Notifications/index.ts
@@ -0,0 +1,9 @@
+import Notification from "./Notification.svelte";
+export { Notification };
+import NotificationWrapper from "./NotificationWrapper.svelte";
+export { NotificationWrapper };
+import RawNotificationWrapper from "./RawNotificationWrapper.svelte";
+export { RawNotificationWrapper };
+import RawNotification from "./RawNotification.svelte";
+export { RawNotification };
+export * from "./shared.js";
diff --git a/src/modules/Ausweise/VerbrauchsausweisWohnenModule.svelte b/src/modules/Ausweise/VerbrauchsausweisWohnenModule.svelte
index e46d24b7..f4d08b75 100644
--- a/src/modules/Ausweise/VerbrauchsausweisWohnenModule.svelte
+++ b/src/modules/Ausweise/VerbrauchsausweisWohnenModule.svelte
@@ -9,7 +9,7 @@
 	import ZipSearch from "#components/PlzSuche.svelte";
 	import moment from "moment";
 	import BilderZusatzsysteme from "#components/Ausweis/BilderZusatzsysteme.svelte";
-	import { RawNotificationWrapper, RawNotification, notifications } from "@ibcornelsen/ui";
+	import { RawNotificationWrapper, RawNotification, notifications } from "#components/Notifications/index.js";
 	import { auditHeizungGebaeudeBaujahr } from "#components/Verbrauchsausweis/audits/HeizungGebaeudeBaujahr.js";
 	import { auditHeizungJuengerDreiJahre } from "#components/Verbrauchsausweis/audits/HeizungJuengerDreiJahre.js";
 	import { auditZeitraumAktuell } from "#components/Verbrauchsausweis/audits/ZeitraumAktuell.js";
diff --git a/src/pages/pdf/ansichtsausweis.astro b/src/pages/pdf/ansichtsausweis.astro
index 65e61741..67711326 100644
--- a/src/pages/pdf/ansichtsausweis.astro
+++ b/src/pages/pdf/ansichtsausweis.astro
@@ -10,7 +10,7 @@ if (base64) {
 	const json = buffer.toString("utf-8");
 	ausweis = JSON.parse(json) as VerbrauchsausweisWohnenClient;
 } else {
-	const uidAusweis = Astro.url.searchParams.get("ausweis_uid");
+	const uidAusweis = Astro.url.searchParams.get("uid");
 
 	if (!uidAusweis) {
 		return Astro.redirect("/404");
diff --git a/src/pages/pdf/datenblatt.astro b/src/pages/pdf/datenblatt.astro
index 622faeb5..5cc883d6 100644
--- a/src/pages/pdf/datenblatt.astro
+++ b/src/pages/pdf/datenblatt.astro
@@ -14,7 +14,7 @@ if (base64) {
 	const json = buffer.toString("utf-8");
 	ausweis = JSON.parse(json) as VerbrauchsausweisWohnenClient;
 } else {
-	const uidAusweis = Astro.url.searchParams.get("ausweis_uid");
+	const uidAusweis = Astro.url.searchParams.get("uid");
 
 	if (!uidAusweis) {
 		return Astro.redirect("/404");
diff --git a/tsconfig.json b/tsconfig.json
index b089c7e8..d0aa885f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -28,6 +28,6 @@
 			"#client/*": ["./src/client/*"],
 			"#server/*": ["./src/server/*"],
 		},
-		"types": ["cypress", "cypress-file-upload", "bun-types"]
+		"types": ["cypress", "cypress-file-upload", "bun-types", "svelte"]
 	}
 }