diff --git a/package-lock.json b/package-lock.json
index aadd5401..03adc52e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,7 +32,7 @@
         "stripe": "^9.2.0",
         "svelte-fa": "^2.4.0",
         "svelte-markdown": "^0.2.2",
-        "sveltestrap": "^5.9.0",
+        "sveltestrap": "github:laxadev/sveltestrap",
         "timeago.js": "^4.0.2",
         "uuid": "^8.3.2",
         "zod": "^3.16.1"
@@ -58,7 +58,7 @@
         "tough-cookie": "^4.0.0",
         "ts-node": "^10.8.0",
         "tslib": "^2.4.0",
-        "typescript": "^4.7.0-dev.20220501",
+        "typescript": "^4.6.4",
         "vite-plugin-iso-import": "^0.1.3",
         "vitest": "^0.12.9",
         "vitest-svelte-kit": "^0.0.6"
@@ -662,9 +662,9 @@
       }
     },
     "node_modules/@popperjs/core": {
-      "version": "2.11.2",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.2.tgz",
-      "integrity": "sha512-92FRmppjjqz29VMJ2dn+xdyXZBrMlE42AV6Kq6BwjWV7CNUW1hs2FtxSNLQE+gJhaZ6AAmYuO9y8dshhcBl7vA==",
+      "version": "2.11.5",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz",
+      "integrity": "sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/popperjs"
@@ -3948,10 +3948,9 @@
     },
     "node_modules/sveltestrap": {
       "version": "5.9.0",
-      "resolved": "https://registry.npmjs.org/sveltestrap/-/sveltestrap-5.9.0.tgz",
-      "integrity": "sha512-ZSiYKYrKhDMhhbamnAFK3RK/uqUdcLgjae5Fk3GYdv6Ccth0tN2y6vSg+Vp/PBTYc51u08ZwnYvt8SfWSRNCMA==",
+      "resolved": "git+ssh://git@github.com/laxadev/sveltestrap.git#d01fce867e16efddbfafe0b89575c7f2ad03ef6c",
       "dependencies": {
-        "@popperjs/core": "^2.9.2"
+        "@popperjs/core": "^2.11.4"
       },
       "peerDependencies": {
         "svelte": "^3.29.0"
@@ -4184,9 +4183,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "4.7.0-dev.20220501",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.0-dev.20220501.tgz",
-      "integrity": "sha512-B7jOkO+Wxe8+MfKAtjAeA0iQQVAYnUXDkdoqw9CjRQX87ZcLZxUvlqkcWmBdJ5swzbFjFAqa4PJvN5zOTgSOUw==",
+      "version": "4.6.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz",
+      "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -5040,9 +5039,9 @@
       }
     },
     "@popperjs/core": {
-      "version": "2.11.2",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.2.tgz",
-      "integrity": "sha512-92FRmppjjqz29VMJ2dn+xdyXZBrMlE42AV6Kq6BwjWV7CNUW1hs2FtxSNLQE+gJhaZ6AAmYuO9y8dshhcBl7vA=="
+      "version": "2.11.5",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz",
+      "integrity": "sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw=="
     },
     "@rollup/pluginutils": {
       "version": "4.2.1",
@@ -7360,11 +7359,10 @@
       }
     },
     "sveltestrap": {
-      "version": "5.9.0",
-      "resolved": "https://registry.npmjs.org/sveltestrap/-/sveltestrap-5.9.0.tgz",
-      "integrity": "sha512-ZSiYKYrKhDMhhbamnAFK3RK/uqUdcLgjae5Fk3GYdv6Ccth0tN2y6vSg+Vp/PBTYc51u08ZwnYvt8SfWSRNCMA==",
+      "version": "git+ssh://git@github.com/laxadev/sveltestrap.git#d01fce867e16efddbfafe0b89575c7f2ad03ef6c",
+      "from": "sveltestrap@git+https://github.com/laxadev/sveltestrap.git",
       "requires": {
-        "@popperjs/core": "^2.9.2"
+        "@popperjs/core": "^2.11.4"
       }
     },
     "tapable": {
@@ -7514,9 +7512,9 @@
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="
     },
     "typescript": {
-      "version": "4.7.0-dev.20220501",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.0-dev.20220501.tgz",
-      "integrity": "sha512-B7jOkO+Wxe8+MfKAtjAeA0iQQVAYnUXDkdoqw9CjRQX87ZcLZxUvlqkcWmBdJ5swzbFjFAqa4PJvN5zOTgSOUw==",
+      "version": "4.6.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz",
+      "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==",
       "dev": true
     },
     "undici": {
diff --git a/package.json b/package.json
index a4092968..402d8241 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "tough-cookie": "^4.0.0",
     "ts-node": "^10.8.0",
     "tslib": "^2.4.0",
-    "typescript": "^4.7.0-dev.20220501",
+    "typescript": "^4.6.4",
     "vite-plugin-iso-import": "^0.1.3",
     "vitest": "^0.12.9",
     "vitest-svelte-kit": "^0.0.6"
@@ -68,7 +68,7 @@
     "stripe": "^9.2.0",
     "svelte-fa": "^2.4.0",
     "svelte-markdown": "^0.2.2",
-    "sveltestrap": "^5.9.0",
+    "sveltestrap": "github:laxadev/sveltestrap",
     "timeago.js": "^4.0.2",
     "uuid": "^8.3.2",
     "zod": "^3.16.1"
diff --git a/src/lib/SpeechSystem.ts b/src/lib/SpeechSystem.ts
index 4454c49e..0cd611d3 100644
--- a/src/lib/SpeechSystem.ts
+++ b/src/lib/SpeechSystem.ts
@@ -12,7 +12,7 @@ export class SpeechSystem {
       return voices
 
     // Voices haven't loaded yet, wait for them
-    return await new Promise((resolve, reject) => {
+    return await new Promise((resolve) => {
       speechSynthesis.onvoiceschanged = () => {
         resolve(speechSynthesis.getVoices())
       }
diff --git a/src/lib/client/SprachyUserSPA.ts b/src/lib/client/SprachyUserSPA.ts
index 1ed69add..20121a26 100644
--- a/src/lib/client/SprachyUserSPA.ts
+++ b/src/lib/client/SprachyUserSPA.ts
@@ -8,7 +8,7 @@ import { sprachdex } from "$lib/sprachdex"
 import { time } from "$lib/time"
 import { CanvasEffects } from "$lib/client/CanvasEffects"
 import { SpeechSystem } from '$lib/SpeechSystem'
-import { derived, get, writable, type Writable } from 'svelte/store'
+import { derived, writable, type Writable } from 'svelte/store'
 
 export type Review = Exercise & {
   pattern: PatternAndProgress
diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte
index 8b9a13c8..98e1726b 100644
--- a/src/routes/__layout.svelte
+++ b/src/routes/__layout.svelte
@@ -1,6 +1,6 @@
 <script lang="ts" context="module">
   import { isAuthedRoute } from "$lib/routing"
-  import type { Load } from "./__layout"
+  import type { Load } from "@sveltejs/kit"
 
   export const load: Load = async ({ url, session }) => {
     const needsAuth = isAuthedRoute(url.pathname)
diff --git a/src/routes/index.svelte b/src/routes/index.svelte
index 1cde5feb..99bf7b9d 100644
--- a/src/routes/index.svelte
+++ b/src/routes/index.svelte
@@ -1,7 +1,6 @@
 <script lang="ts" context="module">
   export const prerender = true
-
-  import type { Load } from "./index"
+  import type { Load } from "@sveltejs/kit"
 
   export const load: Load = async ({ session }) => {
     if (session.userId) {
diff --git a/src/routes/pattern/[pattern].svelte b/src/routes/pattern/[pattern].svelte
index f00dba49..81bf1f5a 100644
--- a/src/routes/pattern/[pattern].svelte
+++ b/src/routes/pattern/[pattern].svelte
@@ -1,8 +1,8 @@
 <script lang="ts" context="module">
   import { sprachdex } from "$lib/sprachdex"
-  import type { Load } from "./[pattern]"
+  import type { Load } from "@sveltejs/kit"
 
-  export const load: Load = async ({ params }) => {
+  export const load: Load<{ pattern: string }> = async ({ params }) => {
     const pattern = sprachdex.patternsIncludingDrafts.find(
       (p) => p.slug === params.pattern
     )
diff --git a/src/routes/story/[story].svelte b/src/routes/story/[story].svelte
index d3ef38c0..86be0723 100644
--- a/src/routes/story/[story].svelte
+++ b/src/routes/story/[story].svelte
@@ -1,8 +1,8 @@
 <script lang="ts" context="module">
   import { sprachdex } from "$lib/sprachdex"
-  import type { Load } from "./[story]"
+  import type { Load } from "@sveltejs/kit"
 
-  export const load: Load = async ({ params }) => {
+  export const load: Load<{ story: string }> = async ({ params }) => {
     const pattern = sprachdex.patternsIncludingDrafts.find(
       (p) => p.slug === params.story
     )
diff --git a/tsconfig.json b/tsconfig.json
index ac52127c..66295041 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,9 +1,6 @@
 {
   "extends": "./.svelte-kit/tsconfig.json",
   "compilerOptions": {
-    "target": "es6",
-    "module": "esnext",
-    "moduleResolution": "nodenext",
     "plugins": [
       {
         "name": "vite-plugin-iso-import"