Bugfix:

- Update to @tabler/icons-svelte-runes for a more 'Svente 5' experience. - Adjust error handling in load functions, plain error thrown for handling in the error handler. - Fix the warning regarding a click handler attached to an <img> on the About page - Re-organise component directory - Remove unused font declarations from global.css Features: - Add service-worker caching of FilterData API response to allow for filtering to work fully offline -
Adjust styling of 'estimated times'
2026-05-15 21:19:12 +01:00 · 2026-05-15 18:58:45 +01:00 · 2026-05-14 19:43:22 +01:00 · 2026-05-14 19:39:05 +01:00 · 2026-05-13 20:47:01 +01:00 · 2026-05-12 20:35:12 +01:00
38 changed files with 1118 additions and 354 deletions
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,8 +8,8 @@
 			"name": "web-pwa",
 			"version": "0.0.1",
 			"dependencies": {
-				"@owlboard/owlboard-ts": "^3.0.0-dev.20260509t2101",
-				"@tabler/icons-svelte": "^3.40.0"
+				"@owlboard/api-schema-types": "^3.0.3-alpha19",
+				"@owlboard/owlboard-ts": "^3.0.0-dev.20260509t2101"
 			},
 			"devDependencies": {
 				"@eslint/compat": "^2.0.2",
@@ -18,6 +18,7 @@
 				"@sveltejs/adapter-static": "^3.0.10",
 				"@sveltejs/kit": "^2.50.2",
 				"@sveltejs/vite-plugin-svelte": "^6.2.4",
+				"@tabler/icons-svelte-runes": "^3.44.0",
 				"@types/node": "^22",
 				"@vitest/browser-playwright": "^4.0.18",
 				"eslint": "^9.39.2",
@@ -759,6 +760,7 @@
 			"version": "0.3.13",
 			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
 			"integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@jridgewell/sourcemap-codec": "^1.5.0",
@@ -769,6 +771,7 @@
 			"version": "2.3.5",
 			"resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz",
 			"integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@jridgewell/gen-mapping": "^0.3.5",
@@ -779,6 +782,7 @@
 			"version": "3.1.2",
 			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
 			"integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": ">=6.0.0"
@@ -788,12 +792,14 @@
 			"version": "1.5.5",
 			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
 			"integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@jridgewell/trace-mapping": {
 			"version": "0.3.31",
 			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
 			"integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@jridgewell/resolve-uri": "^3.1.0",
@@ -801,9 +807,9 @@
 			}
 		},
 		"node_modules/@owlboard/api-schema-types": {
-			"version": "3.0.3-alpha17",
-			"resolved": "https://git.fjla.uk/api/packages/OwlBoard/npm/%40owlboard%2Fapi-schema-types/-/3.0.3-alpha17/api-schema-types-3.0.3-alpha17.tgz",
-			"integrity": "sha512-9jtsajZIq/1W9w1XPSIQSH/rcH2mfnS+3XoQpe81Yor2pOVl5+iyHZ9wAlJLrLEVKVVs3k4lkjcM5l6KgWgd9w==",
+			"version": "3.0.3-alpha19",
+			"resolved": "https://git.fjla.uk/api/packages/OwlBoard/npm/%40owlboard%2Fapi-schema-types/-/3.0.3-alpha19/api-schema-types-3.0.3-alpha19.tgz",
+			"integrity": "sha512-dVtJAw1p1SLsv9nEojUaku1BPPJnypoX5ZOoONboN8fh81kqGM16OVR69GEHhwuPgJDaPLDUSBxtYYAKZ6ZTcQ==",
 			"license": "MIT"
 		},
 		"node_modules/@owlboard/owlboard-ts": {
@@ -1202,6 +1208,7 @@
 			"version": "1.0.9",
 			"resolved": "https://registry.npmjs.org/@sveltejs/acorn-typescript/-/acorn-typescript-1.0.9.tgz",
 			"integrity": "sha512-lVJX6qEgs/4DOcRTpo56tmKzVPtoWAaVbL4hfO7t7NVwl9AAXzQR6cihesW1BmNMPl+bK6dreu2sOKBP2Q9CIA==",
+			"dev": true,
 			"license": "MIT",
 			"peerDependencies": {
 				"acorn": "^8.9.0"
@@ -1218,9 +1225,9 @@
 			}
 		},
 		"node_modules/@sveltejs/kit": {
-			"version": "2.59.1",
-			"resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.59.1.tgz",
-			"integrity": "sha512-d8OON70AphLdDesuTIl//M2O6fRTIicX8aYv8vhCiYEhTTI2OboKqey0Hu1A4VFhqwgqtq0vKDmPFGkw8kKmgw==",
+			"version": "2.60.1",
+			"resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.60.1.tgz",
+			"integrity": "sha512-mQjlkNo+rJvpln7V2IGY2j99BqhcFbS4UN0AQNKNYfhBAFZTuCDAdW3a1sgf330mvtNvsBXn3HpAhcmvdJTcIQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1229,7 +1236,7 @@
 				"@types/cookie": "^0.6.0",
 				"acorn": "^8.14.1",
 				"cookie": "^0.6.0",
-				"devalue": "^5.6.4",
+				"devalue": "^5.8.1",
 				"esm-env": "^1.2.2",
 				"kleur": "^4.1.5",
 				"magic-string": "^0.30.5",
@@ -1302,16 +1309,18 @@
 			"version": "3.44.0",
 			"resolved": "https://registry.npmjs.org/@tabler/icons/-/icons-3.44.0.tgz",
 			"integrity": "sha512-Wn0AOZG9sg0L+bjfMqq4eNhC6pQjIrk94LvvWYNYkY8KH8wC3YILRzQlrnVJc4FUeMxH/AK97QsYCX35H3LndA==",
+			"dev": true,
 			"license": "MIT",
 			"funding": {
 				"type": "github",
 				"url": "https://github.com/sponsors/codecalm"
 			}
 		},
-		"node_modules/@tabler/icons-svelte": {
+		"node_modules/@tabler/icons-svelte-runes": {
 			"version": "3.44.0",
-			"resolved": "https://registry.npmjs.org/@tabler/icons-svelte/-/icons-svelte-3.44.0.tgz",
-			"integrity": "sha512-ZJJMCHoqpvb9hLVn9dU+pn8LCdX/e+mJ/fC+EUaJT5nHEm0+IW4aKKYkYQI+rFMzN8ivj36MnMC5TGFi4H6zew==",
+			"resolved": "https://registry.npmjs.org/@tabler/icons-svelte-runes/-/icons-svelte-runes-3.44.0.tgz",
+			"integrity": "sha512-kncwVrQByKnhquybudKYQ1m9OT2Pjl2MEyGhAJmySPjm3uG5CjmcE66jag7A9Hz/D+fuRXYNcHtq99ontyi4aA==",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@tabler/icons": "3.44.0"
@@ -1321,7 +1330,7 @@
 				"url": "https://github.com/sponsors/codecalm"
 			},
 			"peerDependencies": {
-				"svelte": ">=3 <6 || >=5.0.0-next.0"
+				"svelte": "^5.0.0"
 			}
 		},
 		"node_modules/@testing-library/svelte-core": {
@@ -1366,6 +1375,7 @@
 			"version": "1.0.9",
 			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz",
 			"integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==",
+			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@types/json-schema": {
@@ -1389,6 +1399,7 @@
 			"version": "2.0.7",
 			"resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
 			"integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
+			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@typescript-eslint/eslint-plugin": {
@@ -1541,7 +1552,7 @@
 			"version": "8.59.2",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.59.2.tgz",
 			"integrity": "sha512-e82GVOE8Ps3E++Egvb6Y3Dw0S10u8NkQ9KXmtRhCWJJ8kDhOJTvtMAWnFL16kB1583goCWXsr0NieKCZMs2/0Q==",
-			"devOptional": true,
+			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1837,6 +1848,7 @@
 			"version": "8.16.0",
 			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
 			"integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
+			"dev": true,
 			"license": "MIT",
 			"bin": {
 				"acorn": "bin/acorn"
@@ -1899,6 +1911,7 @@
 			"version": "5.3.1",
 			"resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.1.tgz",
 			"integrity": "sha512-Z/ZeOgVl7bcSYZ/u/rh0fOpvEpq//LZmdbkXyc7syVzjPAhfOa9ebsdTSjEBDU4vs5nC98Kfduj1uFo0qyET3g==",
+			"dev": true,
 			"license": "Apache-2.0",
 			"engines": {
 				"node": ">= 0.4"
@@ -1918,6 +1931,7 @@
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz",
 			"integrity": "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==",
+			"dev": true,
 			"license": "Apache-2.0",
 			"engines": {
 				"node": ">= 0.4"
@@ -1998,6 +2012,7 @@
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
 			"integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
+			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": ">=6"
@@ -2111,9 +2126,10 @@
 			}
 		},
 		"node_modules/devalue": {
-			"version": "5.8.0",
-			"resolved": "https://registry.npmjs.org/devalue/-/devalue-5.8.0.tgz",
-			"integrity": "sha512-2zA9pFEsnp7vWBZbXF5JAgAq0fsUIt/1XPbRiAmRV3lp/2C3upzH+sADiyy66aFCihoLEsrQHxNM5w1gIDfsBg==",
+			"version": "5.8.1",
+			"resolved": "https://registry.npmjs.org/devalue/-/devalue-5.8.1.tgz",
+			"integrity": "sha512-4CXDYRBGqN+57wVJkuXBYmpAVUSg3L6JAQa/DFqm238G73E1wuyc/JhGQJzN7vUf/CMphYau2zXbfWzDR5aTEw==",
+			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/es-module-lexer": {
@@ -2348,6 +2364,7 @@
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/esm-env/-/esm-env-1.2.2.tgz",
 			"integrity": "sha512-Epxrv+Nr/CaL4ZcFGPJIYLWFom+YeV1DqMLHJoEd9SYRxNbaFruBwfEX/kkHUJf55j2+TUbmDcmuilbP1TmXHA==",
+			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/espree": {
@@ -2385,6 +2402,7 @@
 			"version": "2.2.6",
 			"resolved": "https://registry.npmjs.org/esrap/-/esrap-2.2.6.tgz",
 			"integrity": "sha512-WN0clHt0a4mzC780UBVVBpsj4vSSjOFNRd2WjYtduB9HeKxm1sjHMNUwLEHVjI3FdCQD/Hurgz9ftbKEzP79Ow==",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@jridgewell/sourcemap-codec": "^1.4.15"
@@ -2665,6 +2683,7 @@
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.3.tgz",
 			"integrity": "sha512-ixkJoqQvAP88E6wLydLGGqCJsrFUnqoH6HnaczB8XmDH1oaWU+xxdptvikTgaEhtZ53Ky6YXiBuUI2WXLMCwjw==",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@types/estree": "^1.0.6"
@@ -2772,6 +2791,7 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/locate-character/-/locate-character-3.0.0.tgz",
 			"integrity": "sha512-SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA==",
+			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/locate-path": {
@@ -2801,6 +2821,7 @@
 			"version": "0.30.21",
 			"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
 			"integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@jridgewell/sourcemap-codec": "^1.5.5"
@@ -5187,9 +5208,10 @@
 			}
 		},
 		"node_modules/svelte": {
-			"version": "5.55.5",
-			"resolved": "https://registry.npmjs.org/svelte/-/svelte-5.55.5.tgz",
-			"integrity": "sha512-2uCs/LZ9us+AktdzYJM8OcxQ8qnPS1kpaO7syGT/MgO+6Qr1Ybl+TqPq+97u7PHqmmMlye5ZkoyXONy5mjjAbw==",
+			"version": "5.55.7",
+			"resolved": "https://registry.npmjs.org/svelte/-/svelte-5.55.7.tgz",
+			"integrity": "sha512-ymI5ykLPwIHW839E053FQbI1G+jnRFJEw3Kv5Y4njixVWywQBx+NUFpkkKyk5LIb36Fg9DVXSYpqiGekLD0hyw==",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@jridgewell/remapping": "^2.3.4",
@@ -5201,7 +5223,7 @@
 				"aria-query": "5.3.1",
 				"axobject-query": "^4.1.0",
 				"clsx": "^2.1.1",
-				"devalue": "^5.6.4",
+				"devalue": "^5.8.1",
 				"esm-env": "^1.2.1",
 				"esrap": "^2.2.4",
 				"is-reference": "^3.0.3",
@@ -5727,6 +5749,7 @@
 			"version": "1.1.4",
 			"resolved": "https://registry.npmjs.org/zimmerframe/-/zimmerframe-1.1.4.tgz",
 			"integrity": "sha512-B58NGBEoc8Y9MWWCQGl/gq9xBCe4IiKM0a2x7GZdQKOW5Exr8S1W24J6OgM1njK8xCRGvAJIL/MxXHf6SkmQKQ==",
+			"dev": true,
 			"license": "MIT"
 		}
 	}
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
 		"@sveltejs/adapter-static": "^3.0.10",
 		"@sveltejs/kit": "^2.50.2",
 		"@sveltejs/vite-plugin-svelte": "^6.2.4",
+		"@tabler/icons-svelte-runes": "^3.44.0",
 		"@types/node": "^22",
 		"@vitest/browser-playwright": "^4.0.18",
 		"eslint": "^9.39.2",
@@ -41,7 +42,7 @@
 		"vitest-browser-svelte": "^2.0.2"
 	},
 	"dependencies": {
-		"@owlboard/owlboard-ts": "^3.0.0-dev.20260509t2101",
-		"@tabler/icons-svelte": "^3.40.0"
+		"@owlboard/api-schema-types": "^3.0.3-alpha19",
+		"@owlboard/owlboard-ts": "^3.0.0-dev.20260509t2101"
 	}
 }
--- a/src/app.html
+++ b/src/app.html
@@ -3,12 +3,14 @@
 	<head>
 		<meta charset="utf-8" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
-		<link rel="manifest" href="/manifest.webmanifest" />
 		<meta name="title" content="OwlBoard | Your fastest route to live and reference data" />
 		<meta
 			name="description"
 			content="Live station departures, Live train tracking, PIS Codes & more"
 		/>
+		<!-- PWA Requirements -->
+		<link rel="manifest" href="%sveltekit.assets%/manifest.json" />
+		<link rel="apple-touch-icon" href="%sveltekit.assets%/icons/apple-touch-icon.png" />
 		<meta name="theme-color" content="#4fd1d1" />
 		<link rel="canonical" href="https://owlboard.info" />
 		<meta property="og:type" content="website" />
--- a/src/lib/assets/apple-touch-icon.png
+++ b/src/lib/assets/apple-touch-icon.png
--- a/src/lib/assets/owlboard-logo-square.svg
+++ b/src/lib/assets/owlboard-logo-square.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" viewBox="0 0 562.1 562.1"><defs><radialGradient xlink:href="#a" id="b" cx="256" cy="256" r="254" fx="256" fy="256" gradientTransform="translate(27 27)" gradientUnits="userSpaceOnUse"/><linearGradient id="a"><stop offset="0" stop-color="#2b343c"/><stop offset="1" stop-color="#404c55"/></linearGradient></defs><path fill="url(#b)" d="M694.3 283a411.3 394 0 0 1-410.7 394 411.3 394 0 0 1-412-392.8 411.3 394 0 0 1 409.5-395.1 411.3 394 0 0 1 413.2 391.4" transform="translate(-2 -2)"/><path fill="#4fd1d1" d="M281 81a200 200 0 0 0-153.4 71.8 120 120 0 0 0 50.5 25.8c9 2.3 8.9 2.3 15.6-.6 50-21.6 124.4-21.6 175.2-.1 13.3 5.6 44.6-6.5 65.9-24.8a200 200 0 0 0-153.8-72m-161.9 82.7a200 200 0 0 0-38 117.3 200 200 0 0 0 200 200 200 200 0 0 0 200-200 200 200 0 0 0-37.8-116.8 96 96 0 0 1-17.7 46.6l-2.8 4 1.3 1.8c73.3 99.2-14.3 222.2-116.7 163.6-2.5-1.4-4.7-2.4-5-2.1s-10.5 19.6-18 34c-3.4 6.5-2.7 6.6-6.3-.3-9.2-17.5-18-34-18.3-34-.1 0-2.3 1-4.7 2.5-101.3 58-190.7-65.7-117.4-162.4q2.3-3 1.8-3.6a102 102 0 0 1-20.4-50.6m86.5 57q-14.6 0-29.8 7.5C108 261.8 143.1 366.4 217.5 352a68 68 0 0 0 43.3-28.4c2.4-3.4 3.3-4.2 3.7-3.7l8.5 14.6c9.4 16.3 8 15 11.4 9 5.1-9 13.7-23.5 14-24 .3-.2 1.9 1.8 3.6 4.3 31 45.5 101.6 35.6 118.3-16.5a66.4 66.4 0 0 0-83.9-83c-23.3 7.7-38.7 24.4-53.8 58.4l-1.3 3-2.7-6c-17-38.5-43.7-59.5-73-59.2m147.2 34.7a32 32 0 0 1 23.7 9.5c22.8 22.8.7 60.8-30.9 53.1a32 32 0 0 1-23.2-37.3 31.5 31.5 0 0 1 30.4-25.3m-145.8 0c16.4-.8 32.7 11 33.9 30.1a32.2 32.2 0 0 1-40.1 32.5 31.5 31.5 0 0 1-15-52.9 32 32 0 0 1 21.2-9.6m12 9.6q-3.3 0-5.8 3c-6.3 7.4 2.5 17.7 11 13a9 9 0 0 0 4.2-7.5c0-5.4-4.8-8.9-9.4-8.5m123.1 0c-6 .5-9.6 6.5-7 12.3 2 4.5 8.3 6.3 12.2 3.6 7.2-4.9 4.7-15.3-4-15.8z"/></svg>
--- a/src/lib/components/ui/NoResults.svelte
+++ b/src/lib/components/ui/NoResults.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import noResult from '$lib/assets/img/no-data.svg';
-	import Button from '$lib/components/ui/Button.svelte';
+	import Button from '$lib/components/ui/form-elements/Button.svelte';
 	let { title = 'No results', message = 'Try checking your search term' } = $props();
 </script>

--- a/src/lib/components/ui/TrainService.svelte
+++ b/src/lib/components/ui/TrainService.svelte
@@ -6,7 +6,8 @@
 	import { formatUkTime, calculateDelay } from '$lib/utils/time';
 	import TocStyle from '$lib/components/ui/TocStyle.svelte';
 	import TiplocConverter from '$lib/components/ui/TiplocConverter.svelte';
-	import { IconChevronDownFilled } from '@tabler/icons-svelte';
+	import { IconChevronDownFilled } from '@tabler/icons-svelte-runes';
+	import { estClass } from '$lib/utils/time';
 	let { service }: { service: ApiTrainsTrainByHeadcode.TrainByHeadcodeResponse } = $props();
 	let isExpanded = $state(false);
 	let loadingDetails = $state(false);
@@ -45,8 +46,6 @@
 		loadingDetails = false;
 	}

-	const estClass = (act, est) => (!act && est ? 'est' : 'act');
-
 	const activityMap: Record<string, string> = {
 		'-D': 'Vehicles detatched',
 		'-T': 'Vehicles attached & detached',
--- a/src/lib/components/ui/cards/BaseCard.svelte
+++ b/src/lib/components/ui/cards/BaseCard.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { Snippet } from 'svelte';
-	import { IconHelpCircle } from '@tabler/icons-svelte';
+	import { IconHelpCircle } from '@tabler/icons-svelte-runes';
 	import { slide } from 'svelte/transition';

 	interface Props {
--- a/src/lib/components/ui/cards/HeadcodeSearchCard.svelte
+++ b/src/lib/components/ui/cards/HeadcodeSearchCard.svelte
@@ -1,8 +1,7 @@
 <script lang="ts">
 	import { goto } from '$app/navigation';
 	import BaseCard from '$lib/components/ui/cards/BaseCard.svelte';
-	import Textbox from '$lib/components/ui/Textbox.svelte';
-	import Button from '$lib/components/ui/Button.svelte';
+	import Textbox from '$lib/components/ui/form-elements/Textbox.svelte';

 	let headcode = $state('');

--- a/src/lib/components/ui/cards/LocationBoardCard.svelte
+++ b/src/lib/components/ui/cards/LocationBoardCard.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import BaseCard from '$lib/components/ui/cards/BaseCard.svelte';
-	import LocationSearchBox from '$lib/components/ui/LocationSearchBox.svelte';
+	import LocationSearchBox from '$lib/components/ui/form-elements/LocationSearchBox.svelte';

 	let locationValue = $state('');

--- a/src/lib/components/ui/cards/NearbyStationsCard.svelte
+++ b/src/lib/components/ui/cards/NearbyStationsCard.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import BaseCard from '$lib/components/ui/cards/BaseCard.svelte';
-	import Button from '$lib/components/ui/Button.svelte';
+	import Button from '$lib/components/ui/form-elements/Button.svelte';

 	import { fade } from 'svelte/transition';
 	import { flip } from 'svelte/animate';
--- a/src/lib/components/ui/cards/QuickLinksCard.svelte
+++ b/src/lib/components/ui/cards/QuickLinksCard.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import BaseCard from '$lib/components/ui/cards/BaseCard.svelte';
-	import Button from '$lib/components/ui/Button.svelte';
+	import Button from '$lib/components/ui/form-elements/Button.svelte';

 	import { fade } from 'svelte/transition';
 	import { flip } from 'svelte/animate';
--- a/src/lib/components/ui/cards/StationAlertCard.svelte
+++ b/src/lib/components/ui/cards/StationAlertCard.svelte
@@ -1,137 +0,0 @@
-<script lang="ts">
-	import { slide } from 'svelte/transition';
-	import type { ApiStationsBoard } from '@owlboard/owlboard-ts';
-	import { IconAlertOctagonFilled, IconChevronDownFilled } from '@tabler/icons-svelte';
-
-	let { messages = [] }: { messages: ApiStationsBoard.BoardMsgs[] } = $props();
-	let isOpen = $state(false);
-</script>
-
-{#if messages.length > 0}
-	<aside class="alert-card">
-		<button onclick={() => (isOpen = !isOpen)} class="trigger" class:active={isOpen}>
-			<span class="warning-icon">
-                <IconAlertOctagonFilled />
-            </span>
-			<span class="summary">
-				{messages.length}
-				{messages.length === 1 ? 'active alert' : 'active alerts'}
-			</span>
-			<span class="chevron" class:rotated={isOpen}><IconChevronDownFilled /></span>
-		</button>
-
-    {#if isOpen}
-        <div transition:slide={{ duration: 450 }} class="content">
-            {#each messages as msg}
-                <div class="message-item">
-                    <p class="message-text">
-                        {msg.t}
-                        {#if msg.l && msg.lt}
-                            <a href={msg.l} target="_blank" rel="noopener noreferrer" class="alert-link">
-                                {msg.lt}
-                            </a>
-                        {/if}
-                    </p>
-                </div>
-            {/each}
-        </div>
-    {/if}
-    </aside>
-{/if}
-
-<style>
-    .alert-card {
-        margin: 1rem 0;
-        border-radius: 8px;
-        background: transparent;
-        position: relative;
-        z-index: 10;
-        width: 95%;
-        max-width: 750px;
-    }
-
-    .trigger {
-        width: 100%;
-        display: flex;
-        border-radius: 8px;
-        align-items: center;
-        padding: 0.4rem 1rem;
-        background: var(--alert-orange);
-        color: white;
-        border: none;
-        cursor: pointer;
-        text-align: left;
-        position: relative;
-        z-index: 2;
-        height: 46px;
-        transition: all 0.65s 0.2s;
-    }
-
-    .trigger.active {
-        border-radius: 8px 8px 0 0;
-        transition: all 0.1s 0s;
-    }
-
-    .warning-icon {
-        display: inline-flex;
-        align-items: center;
-        justify-content: center;
-        margin-left: 0;
-        margin-top: 0;
-        margin-bottom: 0;
-        margin-right: 1rem;
-        padding: 0;
-    }
-
-    .summary {
-        flex: 1;
-        font-family: 'URW Gothic', sans-serif;
-        letter-spacing: 0.05em;
-        font-weight: 600;
-        font-size: 1rem;
-    }
-
-    .chevron {
-        transition: transform  0.5s ease;
-        display: inline-flex;
-        justify-content: center;
-    }
-
-    .chevron.rotated {
-        transform: rotateX(180deg);
-    }
-
-    .content {
-        padding: 1rem;
-        position: absolute;
-        top: 46px;
-        border-radius: 0 0 8px 8px;
-        left: 0;
-        right: 0;
-        background: var(--alert-orange);
-        filter: brightness(1.2);
-        color: var(--color-title);
-        font-family: 'URW Gothic', sans-serif;
-        font-size: 1.0rem;
-        font-weight: 600;
-        line-height: 1.2;
-        z-index: 1;
-    }
-
-    .message-item {
-        margin: 10px;
-        padding-bottom: 0.75rem;
-    }
-
-    .message-item p {
-        margin: 0;
-    }
-
-    .message-item a {
-        color: #f2ff00;
-    }
-
-    .message-item:last-child {
-        padding-bottom: 0;
-    }
-</style>
--- a/src/lib/components/ui/cards/pis/PisCode.svelte
+++ b/src/lib/components/ui/cards/pis/PisCode.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
 	import BaseCard from '$lib/components/ui/cards/BaseCard.svelte';
-	import Textbox from '$lib/components/ui/Textbox.svelte';
-	import Button from '$lib/components/ui/Button.svelte';
+	import Textbox from '$lib/components/ui/form-elements/Textbox.svelte';

 	let { onsearch }: { onsearch: (c: string) => void } = $props();
 </script>
--- a/src/lib/components/ui/cards/pis/PisStartEndCard.svelte
+++ b/src/lib/components/ui/cards/pis/PisStartEndCard.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import BaseCard from '$lib/components/ui/cards/BaseCard.svelte';
-	import Textbox from '$lib/components/ui/Textbox.svelte';
-	import Button from '$lib/components/ui/Button.svelte';
+	import Textbox from '$lib/components/ui/form-elements/Textbox.svelte';
+	import Button from '$lib/components/ui/form-elements/Button.svelte';

 	let { onsearch }: { onsearch: (s: string, e: string) => void } = $props();

@@ -15,7 +15,13 @@
 </script>

 <BaseCard header={'Find by Start/End CRS'}>
-	<div class="card-content">
+	<form
+		class="card-content"
+		onsubmit={(e) => {
+			e.preventDefault();
+			onsearch(startValue, endValue);
+		}}
+	>
 		<div class="textbox-container">
 			<div class="textbox-item-wrapper">
 				<Textbox placeholder={'Start'} uppercase={true} maxLength={3} bind:value={startValue} />
@@ -25,10 +31,10 @@
 			</div>
 		</div>
 		<div class="button-wrapper">
-			<Button onclick={() => onsearch(startValue, endValue)}>Search</Button>
+			<Button type={'submit'}>Search</Button>
 			<Button onclick={resetValues}>Reset</Button>
 		</div>
-	</div>
+	</form>
 </BaseCard>

 <style>
--- a/src/lib/components/ui/form-elements/Button.svelte
+++ b/src/lib/components/ui/form-elements/Button.svelte
--- a/src/lib/components/ui/form-elements/LocationSearchBox.svelte
+++ b/src/lib/components/ui/form-elements/LocationSearchBox.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Textbox from '$lib/components/ui/Textbox.svelte';
+	import Textbox from '$lib/components/ui/form-elements/Textbox.svelte';
 	import { onMount } from 'svelte';
 	import { fade } from 'svelte/transition';
 	import { goto } from '$app/navigation';
--- a/src/lib/components/ui/form-elements/Textbox.svelte
+++ b/src/lib/components/ui/form-elements/Textbox.svelte
@@ -2,7 +2,7 @@
 	import { fade } from 'svelte/transition';
 	import type { HTMLInputAttributes } from 'svelte/elements';

-	import { IconChevronRightFilled } from '@tabler/icons-svelte';
+	import { IconChevronRightFilled } from '@tabler/icons-svelte-runes';

 	interface Props extends HTMLInputAttributes {
 		value?: string;
--- a/src/lib/components/ui/station-board/StaffServicesTable.svelte
+++ b/src/lib/components/ui/station-board/StaffServicesTable.svelte
@@ -0,0 +1,418 @@
+<script lang="ts">
+	import type { ApiStationsBoard } from '@owlboard/owlboard-ts';
+	import { formatUkTime, estClass, delayClassFromTimePair } from '$lib/utils/time';
+
+	let { services }: { services: ApiStationsBoard.BoardService[] } = $props();
+
+	const getRowKey = (s: ApiStationsBoard.BoardService) =>
+		`${s.r}${s.sta ?? ''}${s.std ?? ''}${s.wtp ?? ''}`;
+</script>
+
+<table class="departure-board">
+	<colgroup>
+		<col style="width:10%;" />
+		<!-- ID (Headcode) -->
+		<col style="width:17%;" />
+		<!-- ORIG (Origin) -->
+		<col style="width:17%;" />
+		<!-- DEST (Destination) -->
+		<col style="width:9%;" />
+		<!-- PLT (Platform) -->
+		<col style="width: 12%;" />
+		<!-- STA -->
+		<col style="width: 12%;" />
+		<!-- ETA/ATA -->
+		<col style="width: 12%;" />
+		<!-- STD -->
+		<col style="width: 11%;" />
+		<!-- ETD/ATD -->
+	</colgroup>
+	<thead>
+		<tr>
+			<th colspan="4" aria-hidden="true"></th>
+			<th scope="colgroup" colspan="2" class="upper-head"><abbr title="Arrival">Arr</abbr></th>
+			<th scope="colgroup" colspan="2" class="upper-head"><abbr title="Departure">Dep</abbr></th>
+		</tr>
+		<tr>
+			<th scope="col"><abbr title="Headcode">ID</abbr></th>
+			<th scope="col"><abbr title="Origin">Orig</abbr></th>
+			<th scope="col"><abbr title="Destination">Dest</abbr></th>
+			<th scope="col"><abbr title="Platform">Plt</abbr></th>
+			<th scope="col"><abbr title="Scheduled">Sch</abbr></th>
+			<th scope="col"><abbr title="Actual/Expected">Act</abbr></th>
+			<th scope="col"><abbr title="Scheduled">Sch</abbr></th>
+			<th scope="col"><abbr title="Actual/Expected">Act</abbr></th>
+		</tr>
+	</thead>
+
+	{#each services as service (getRowKey(service))}
+		<tbody>
+			<tr
+				class="service-row"
+				class:serviceCancelled={service.c}
+				class:servicePass={service.wtp}
+				class:serviceNonPassenger={!service.ip}
+			>
+				<td class="id-cell">{service.h}</td>
+				<td class="orig-cell"
+					><abbr title={service.og.n.toLocaleUpperCase()}>{service.og.t}</abbr></td
+				>
+				<td class="dest-cell"
+					><abbr title={service.dt.n.toLocaleUpperCase()}>{service.dt.t}</abbr></td
+				>
+				<td class="plt-cell" class:platSup={service.ps} class:platChange={service.pc}
+					>{service.p || '-'}</td
+				>
+
+				<!-- Handle different display for a passing train -->
+				{#if service.wtp}
+					<td class="pass-cell" colspan="2">Pass</td>
+					<td class="time-cell">{formatUkTime(service.wtp)}</td>
+					<!-- If cancelled, show '-', otherwise check for RT or show time -->
+					<td
+						class="time-cell {estClass(service.atp, service.etp)} {delayClassFromTimePair(
+							service.wtp,
+							service.atp || service.etp
+						)}"
+					>
+						<span>
+							{service.c
+								? '-'
+								: delayClassFromTimePair(service.wtp, service.atp || service.etp) === 'delay-rt'
+									? 'RT'
+									: formatUkTime(service.atp || service.etp)}
+						</span>
+					</td>
+				{:else}
+					<td class="time-cell">{formatUkTime(service.sta)}</td>
+
+					<!-- Arrival Actual/Expected -->
+					<td
+						class="time-cell {estClass(service.ata, service.eta)} {delayClassFromTimePair(
+							service.sta,
+							service.ata || service.eta
+						)}"
+					>
+						<span>
+							{service.c
+								? '-'
+								: delayClassFromTimePair(service.sta, service.ata || service.eta) === 'delay-rt'
+									? 'RT'
+									: formatUkTime(service.ata || service.eta)}
+						</span>
+					</td>
+
+					<td class="time-cell">{formatUkTime(service.std)}</td>
+
+					<!-- Departure Actual/Expected -->
+					<td
+						class="time-cell {estClass(service.atd, service.etd)} {delayClassFromTimePair(
+							service.std,
+							service.atd || service.etd
+						)}"
+					>
+						<span>
+							{service.c
+								? '-'
+								: delayClassFromTimePair(service.std, service.atd || service.etd) === 'delay-rt'
+									? 'RT'
+									: formatUkTime(service.atd || service.etd)}
+						</span>
+					</td>
+				{/if}
+			</tr>
+
+			{#if service.o}
+				<tr class="toc-coach-row">
+					<td colspan="8">
+						{service.o}
+					</td>
+				</tr>
+			{/if}
+			{#if service.c && service.cr?.r}
+				<tr class="cancel-row">
+					<td colspan="8">
+						{service.cr.r}
+						{#if service.cr.l}
+							{service.cr.n ? 'near' : 'at'}
+							{service.cr.l}
+						{/if}
+					</td>
+				</tr>
+			{/if}
+			{#if service.dr?.r}
+				<tr class="delay-row">
+					<td colspan="9">
+						{service.dr.r}
+						{#if service.dr.l}
+							{service.dr.n ? 'near' : 'at'}
+							{service.dr.l}
+						{/if}
+					</td>
+				</tr>
+			{/if}
+		</tbody>
+	{/each}
+</table>
+
+<style>
+	.departure-board {
+		width: 100%;
+		margin: 5px auto;
+		border-collapse: collapse;
+		table-layout: fixed;
+	}
+
+	.departure-board td {
+		font-family: 'Inconsolata Variable', monospace;
+		font-size: clamp(1rem, 0.475rem + 2.8vw, 1.35rem);
+		font-variant-ligatures: additional-ligatures;
+		overflow: hidden;
+	}
+
+	thead,
+	.cancel-row td,
+	.delay-row td {
+		letter-spacing: -0.15ch;
+	}
+
+	thead {
+		position: sticky;
+		top: 0;
+		z-index: 2;
+		background: var(--color-bg-dark);
+	}
+
+	abbr {
+		text-decoration: none;
+		border-bottom: none;
+		cursor: help;
+	}
+
+	tbody tr:first-child td {
+		border-top: 5px solid transparent;
+	}
+
+	/* Row Logic */
+	.serviceCancelled {
+		color: rgb(255, 131, 131);
+	}
+
+	.servicePass td {
+		opacity: 0.75;
+		font-weight: 200;
+	}
+
+	.serviceNonPassenger td {
+		opacity: 0.5;
+		font-weight: 290;
+		font-style: italic;
+	}
+
+	/* Special Row Styles */
+	.cancel-row td,
+	.delay-row td {
+		font-size: 0.88rem;
+		text-align: left;
+	}
+
+	.cancel-row td[colspan],
+	.delay-row td[colspan] {
+		padding-left: 0ch;
+	}
+
+	.cancel-row td {
+		color: rgb(255, 131, 131);
+		font-weight: 400;
+	}
+
+	.delay-row td {
+		color: var(--delay-orange);
+		font-style: italic;
+	}
+	@media (min-width: 375px) {
+		.cancel-row td,
+		.delay-row td {
+			font-size: 1.08rem;
+		}
+	}
+	@media (min-width: 420px) {
+		.cancel-row td,
+		.delay-row td {
+			font-size: 1.12rem;
+		}
+	}
+	@media (min-width: 550px) {
+		.cancel-row td,
+		.delay-row td {
+			font-size: 1.18rem;
+		}
+	}
+	@media (min-width: 620px) {
+		.cancel-row td,
+		.delay-row td {
+			font-size: 1.2rem;
+		}
+	}
+
+	.toc-coach-row td {
+		font-family: 'URW Gothic', sans-serif;
+		font-size: 0.7rem;
+		padding: 0;
+		color: rgb(187, 187, 255);
+	}
+	@media (min-width: 400px) {
+		.toc-coach-row td {
+			font-size: 0.8rem;
+		}
+	}
+	@media (min-width: 550px) {
+		.toc-coach-row td {
+			font-size: 0.85rem;
+		}
+	}
+
+	/* Column Specifics */
+	.id-cell {
+		text-align: left;
+		font-weight: 400;
+		font-stretch: 85%;
+		filter: brightness(0.75);
+	}
+	@media (min-width: 400px) {
+		.id-cell {
+			font-stretch: 90%;
+		}
+	}
+	.orig-cell,
+	.dest-cell {
+		font-stretch: 80%;
+		font-weight: 400;
+	}
+	.orig-cell {
+		text-align: left;
+		color: var(--location-yellow);
+	}
+	.dest-cell {
+		text-align: right;
+		color: var(--location-yellow);
+	}
+	@media (min-width: 350px) {
+		.orig-cell,
+		.dest-cell {
+			font-stretch: 85%;
+		}
+		@media (min-width: 400px) {
+			.orig-cell,
+			.dest-cell {
+				font-stretch: 90%;
+			}
+		}
+		@media (min-width: 490px) {
+			.orig-cell,
+			.dest-cell {
+				font-stretch: 95%;
+			}
+		}
+		@media (min-width: 520px) {
+			.orig-cell,
+			.dest-cell {
+				font-stretch: 100%;
+			}
+			.orig-cell {
+				text-align: right;
+				padding-right: 7px;
+			}
+			.dest-cell {
+				text-align: left;
+				padding-left: 7px;
+			}
+		}
+		@media (min-width: 600px) {
+			.orig-cell,
+			.dest-cell {
+				letter-spacing: 0.05ch;
+			}
+		}
+	}
+	.plt-cell {
+		text-align: center;
+		font-weight: 410;
+		font-stretch: 100%;
+	}
+	@media (min-width: 525px) {
+		.plt-cell {
+			font-stretch: 110%;
+		}
+	}
+	.plt-cell.platSup {
+		font-weight: 200;
+		opacity: 0.3;
+	}
+	.plt-cell.platChange {
+		animation: fast-pulse 2s ease-out infinite;
+	}
+	.service-row.serviceCancelled .plt-cell {
+		text-decoration: line-through;
+	}
+	.pass-cell {
+		text-align: center;
+		font-stretch: 100%;
+	}
+	/* Colour orig and dest values when cancelled */
+	.service-row.serviceCancelled .orig-cell,
+	.service-row.serviceCancelled .dest-cell {
+		color: rgb(255, 131, 131);
+	}
+
+	.time-cell {
+		text-align: center;
+		font-stretch: 72%;
+	}
+	@media (min-width: 350px) {
+		.time-cell {
+			font-stretch: 77%;
+		}
+	}
+	@media (min-width: 400px) {
+		.time-cell {
+			font-stretch: 82%;
+		}
+	}
+	@media (min-width: 525px) {
+		.time-cell {
+			font-stretch: 90%;
+		}
+	}
+	@media (min-width: 600px) {
+		.time-cell {
+			font-stretch: 100%;
+		}
+	}
+
+	/* RT Logic */
+	.time-cell.delay-rt span {
+		display: none;
+	}
+	.time-cell.delay-rt::after {
+		content: 'RT';
+	}
+
+	.time-cell.delay-early {
+		color: var(--early-blue);
+	}
+
+	.time-cell.delay-late {
+		color: var(--delay-orange);
+	}
+
+	/* Time Types */
+	.est {
+		font-style: italic;
+		opacity: 0.75;
+		font-weight: 350;
+	}
+	.act {
+		font-weight: 600;
+	}
+</style>
--- a/src/lib/components/ui/station-board/StationAlertCard.svelte
+++ b/src/lib/components/ui/station-board/StationAlertCard.svelte
@@ -0,0 +1,143 @@
+<script lang="ts">
+	import { slide } from 'svelte/transition';
+	import type { ApiStationsBoard } from '@owlboard/owlboard-ts';
+	import { IconAlertOctagonFilled, IconChevronDownFilled } from '@tabler/icons-svelte-runes';
+
+	let { messages = [] }: { messages: ApiStationsBoard.BoardMsgs[] } = $props();
+	let isOpen = $state(false);
+</script>
+
+{#if messages.length > 0}
+	<aside class="alert-card">
+		<button onclick={() => (isOpen = !isOpen)} class="trigger" class:active={isOpen}>
+			<span class="warning-icon">
+				<IconAlertOctagonFilled />
+			</span>
+			<span class="summary">
+				{messages.length}
+				{messages.length === 1 ? 'active alert' : 'active alerts'}
+			</span>
+			<span class="chevron" class:rotated={isOpen}><IconChevronDownFilled /></span>
+		</button>
+
+		{#if isOpen}
+			<div transition:slide={{ duration: 450 }} class="content">
+				{#each messages as msg}
+					<div class="message-item">
+						<p class="message-text">
+							{msg.t}
+							{#if msg.l && msg.lt}
+								<a href={msg.l} target="_blank" rel="noopener noreferrer" class="alert-link">
+									{msg.lt}
+								</a>
+							{/if}
+						</p>
+					</div>
+				{/each}
+			</div>
+		{/if}
+	</aside>
+{/if}
+
+<style>
+	.alert-card {
+		margin: 0;
+		border-radius: 8px;
+		background: transparent;
+		position: relative;
+		z-index: 10;
+		margin-bottom: 0;
+		width: 95%;
+		max-width: 750px;
+		-webkit-tap-highlight-color: transparent;
+	}
+
+	.alert-card:active {
+		filter: brightness(1.2);
+	}
+
+	.trigger {
+		width: 100%;
+		display: flex;
+		border-radius: 8px;
+		align-items: center;
+		padding: 0.1rem 1.05rem;
+		background: var(--alert-orange);
+		color: white;
+		border: none;
+		cursor: pointer;
+		text-align: left;
+		position: relative;
+		z-index: 2;
+		height: 40px;
+		transition: all 0.65s 0.2s;
+	}
+
+	.trigger.active {
+		border-radius: 8px 8px 0 0;
+		transition: all 0.01s 0s;
+	}
+
+	.warning-icon {
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		margin-left: 0;
+		margin-top: 0;
+		margin-bottom: 0;
+		margin-right: 1rem;
+		padding: 0;
+	}
+
+	.summary {
+		flex: 1;
+		font-family: 'URW Gothic', sans-serif;
+		letter-spacing: 0.05em;
+		font-weight: 600;
+		font-size: 1rem;
+	}
+
+	.chevron {
+		transition: transform 0.5s ease;
+		display: inline-flex;
+		justify-content: center;
+	}
+
+	.chevron.rotated {
+		transform: rotateX(180deg);
+	}
+
+	.content {
+		padding: 1rem;
+		position: absolute;
+		top: 40px;
+		border-radius: 0 0 8px 8px;
+		left: 0;
+		right: 0;
+		background: var(--alert-orange);
+		filter: brightness(1.2);
+		color: var(--color-title);
+		font-family: 'URW Gothic', sans-serif;
+		font-size: 1rem;
+		font-weight: 600;
+		line-height: 1.2;
+		z-index: 1;
+	}
+
+	.message-item {
+		margin: 10px;
+		padding-bottom: 0.75rem;
+	}
+
+	.message-item p {
+		margin: 0;
+	}
+
+	.message-item a {
+		color: #f2ff00;
+	}
+
+	.message-item:last-child {
+		padding-bottom: 0;
+	}
+</style>
--- a/src/lib/global.css
+++ b/src/lib/global.css
@@ -129,7 +129,25 @@
 	font-style: normal;
 	font-display: swap;
 }
+
+/* Inconsolata Variable */
+@font-face {
+	font-family: 'Inconsolata Variable';
+	font-style: normal;
+	font-display: swap;
+	font-weight: 200 900;
+	font-stretch: 50% 200%;
+	src: url(/type/inconsolata/latin-wdth-normal.woff2) format('woff2-variations');
+	unicode-range:
+		U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329,
+		U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
 :root {
+	/* Fixed Heights */
+	--header-height: 80px;
+	--nav-height: 60px;
+
 	/* Brand Colours */
 	--color-brand: #4fd1d1;
 	--color-accent: #3c6f79;
@@ -159,7 +177,7 @@
 		opacity: 1;
 	}
 	50% {
-		opacity: 0.3;
+		opacity: 0.5;
 	}
 }

@@ -171,7 +189,7 @@
 	}
 	25%,
 	75% {
-		opacity: 0;
+		opacity: 0.25;
 	}
 }

--- a/src/lib/preferences.svelte.ts
+++ b/src/lib/preferences.svelte.ts
@@ -0,0 +1,43 @@
+import { browser } from '$app/environment';
+
+export interface Preferences {
+	locationEnabled: boolean;
+}
+
+const STORAGE_KEY = 'ob_pref';
+
+const DEFAULT_PREFS: Preferences = {
+	locationEnabled: false
+};
+
+function loadPrefs(): Preferences {
+	if (!browser) return DEFAULT_PREFS;
+	const stored = localStorage.getItem(STORAGE_KEY);
+	if (!stored) return DEFAULT_PREFS;
+
+	try {
+		return { ...DEFAULT_PREFS, ...JSON.parse(stored) };
+	} catch {
+		return DEFAULT_PREFS;
+	}
+}
+
+class PreferencesStore {
+	current = $state<Preferences>(loadPrefs());
+
+	constructor() {
+		$effect.root(() => {
+			$effect(() => {
+				if (browser) {
+					localStorage.setItem(STORAGE_KEY, JSON.stringify(this.current));
+				}
+			});
+		});
+	}
+
+	toggleLocation(enabled: boolean) {
+		this.current.locationEnabled = enabled;
+	}
+}
+
+export const prefs = new PreferencesStore();
--- a/src/lib/quick-links.svelte.ts
+++ b/src/lib/quick-links.svelte.ts
@@ -15,7 +15,11 @@ class QuickLinksService {
 		if (typeof window !== 'undefined') {
 			const saved = localStorage.getItem('ql');
 			if (saved) {
-				this.#links = JSON.parse(saved);
+				try {
+					this.#links = JSON.parse(saved);
+				} catch {
+					this.#links = [];
+				}
 			}
 		}
 	}
@@ -53,7 +57,16 @@ class QuickLinksService {

 		this.#links = sorted.slice(0, MAX_ENTRIES);

-		localStorage.setItem('ql', JSON.stringify(this.#links));
+		if (typeof window !== 'undefined') {
+			localStorage.setItem('ql', JSON.stringify(this.#links));
+		}
+	}
+
+	reset() {
+		this.#links = [];
+		if (typeof window !== 'undefined') {
+			localStorage.removeItem('ql');
+		}
 	}
 }

--- a/src/lib/utils/time.ts
+++ b/src/lib/utils/time.ts
@@ -1,60 +1,96 @@
 import type { ApiTrainsTrainDetails } from '@owlboard/owlboard-ts';
+
+export const estClass = (act: any, est: any) => (act ? 'act' : 'est');
+
 /**
 * Converts ISO/JSON time to UK-formatted HH:MM string, with optional (default off) seconds
 * Ensures Europe/London timezone irrespective of browser timezone.
 */
-export function formatUkTime(dateStr: string | Date | undefined, includeSeconds: boolean = false): string {
-	if (!dateStr) return '--:--';
+export function formatUkTime(
+	dateStr: string | Date | undefined,
+	includeSeconds: boolean = false
+): string {
+	if (!dateStr) return '-';
 	const date = typeof dateStr === 'string' ? new Date(dateStr) : dateStr;

-	if (isNaN(date.getTime())) return '--:--';
+	if (isNaN(date.getTime())) return '-';

-return date.toLocaleTimeString('en-GB', {
-        hour: '2-digit',
-        minute: '2-digit',
-        ...(includeSeconds && { second: '2-digit' }),
-        hour12: false,
-        timeZone: 'Europe/London'
-    });
+	return date.toLocaleTimeString('en-GB', {
+		hour: '2-digit',
+		minute: '2-digit',
+		...(includeSeconds && { second: '2-digit' }),
+		hour12: false,
+		timeZone: 'Europe/London'
+	});
 }

 /**
 * Converts ISO/JSON time to UK-formatted DD/MM/YY HH:MM:SS string.
 * Ensures Europe/London timezone irrespective of browser timezone.
 */
-export function formatUkDateTime(dateStr: string | Date | undefined, includeSeconds: boolean = false): string {
-    if (!dateStr) return '--/--/-- --:--:--';
-    
-    const date = typeof dateStr === 'string' ? new Date(dateStr) : dateStr;
+export function formatUkDateTime(
+	dateStr: string | Date | undefined,
+	includeSeconds: boolean = false
+): string {
+	if (!dateStr) return '--/--/-- --:--:--';

-    if (isNaN(date.getTime())) return '--/--/-- --:--:--';
+	const date = typeof dateStr === 'string' ? new Date(dateStr) : dateStr;

-    return date.toLocaleString('en-GB', {
-        day: '2-digit',
-        month: '2-digit',
-        year: '2-digit',
-        hour: '2-digit',
-        minute: '2-digit',
-        ...(includeSeconds && { second: '2-digit' }),
-        hour12: false,
-        timeZone: 'Europe/London'
-    }).replace(',', '');
+	if (isNaN(date.getTime())) return '--/--/-- --:--:--';
+
+	return date
+		.toLocaleString('en-GB', {
+			day: '2-digit',
+			month: '2-digit',
+			year: '2-digit',
+			hour: '2-digit',
+			minute: '2-digit',
+			...(includeSeconds && { second: '2-digit' }),
+			hour12: false,
+			timeZone: 'Europe/London'
+		})
+		.replace(',', '');
+}
+
+/**
+ * Specific type that can handle the TrainDetails.ServiceLocation and the ApiStationsBoard.BoardService types for delay calculation
+ */
+interface DelayInput {
+	// Board types
+	sta?: string | null;
+	std?: string | null;
+	eta?: string | null;
+	etd?: string | null;
+	ata?: string | null;
+	atd?: string | null;
+
+	// Journey types
+	pta?: string | null;
+	ptd?: string | null;
+	wta?: string | null;
+	wtd?: string | null;
+	atp?: string | null;
+	wtp?: string | null;
+	etp?: string | null;
 }

 /**
 * Calculates a 'delay' value, in the formats:
 * RT, 1E, 7L, etc.
- * @param 'Schedule Location' object
+ * @param 'Schedule Location' or 'Board Service' object
 * @returns Delay string for departure boards
 */
-export function calculateDelay(loc: ApiTrainsTrainDetails.ServiceLocation): {
+export function calculateDelay(loc: DelayInput): {
 	val: string;
 	type: string;
 } {
 	const pairs = [
-		{ actual: loc.atd, sched: loc.ptd ?? loc.wtd },
-		{ actual: loc.ata, sched: loc.pta ?? loc.wta },
-		{ actual: loc.atp, sched: loc.wtp }
+		// Departure check (Board: atd/etd vs std | Journey: atd vs ptd/wtd)
+		{ actual: loc.atd || loc.etd, sched: loc.std || loc.ptd || loc.wtd },
+		// Arrival check (Board: ata/eta vs sta | Journey: ata vs pta/wta)
+		{ actual: loc.ata || loc.eta, sched: loc.sta || loc.pta || loc.wta },
+		// Passing check
+		{ actual: loc.atp || loc.etp, sched: loc.wtp }
 	];

 	const match = pairs.find((p) => p.actual && p.sched);
@@ -72,3 +108,27 @@ export function calculateDelay(loc: ApiTrainsTrainDetails.ServiceLocation): {
 		return { val: `${absDiff}E`, type: 'early' };
 	}
 }
+
+/**
+ * Accepts a pair of times (string or Date) and outputs a delay class 'delay-early', 'delay-late' or 'delay-rt'
+ * @param sched Scheduled Time (string, Date)
+ * @param act Actual Time (string, Date)
+ */
+export function delayClassFromTimePair(sched: any, act: any): string {
+	if (!sched || !act) return '';
+
+	const s = new Date(sched).getTime();
+	const a = new Date(act).getTime();
+
+	if (isNaN(s) || isNaN(a)) return '';
+
+	const diff = a - s;
+	const oneMinute = 60000;
+
+	// on-time if within one minute
+	if (Math.abs(diff) < oneMinute) {
+		return 'delay-rt';
+	}
+
+	return diff > 0 ? 'delay-late' : 'delay-early';
+}
--- a/src/routes/+error.svelte
+++ b/src/routes/+error.svelte
@@ -3,15 +3,21 @@

 	import stopErr from '$lib/assets/img/stop-error.svg';
 	import noResult from '$lib/assets/img/no-data.svg';
-	import Button from '$lib/components/ui/Button.svelte';
+	import Button from '$lib/components/ui/form-elements/Button.svelte';
 </script>

+<!-- Will need to check error type, using the upstream code combined with response code -->
+
 <div class="error-wrapper">
 	{#if page.status == 404}
 		<!-- Warning no data image -->
 		<img class="err-img" src={noResult} alt="" role="presentation" width="200" height="200" />
-	{:else if page.status == 499}
+	{:else if page.status == 503}
 		<!-- Change to a GSM-R X Sign?? -->
+		<span>OFFLINE!</span>
+		<img class="err-img" src={stopErr} alt="" role="presentation" width="150" height="210" />
+	{:else if page.status == 403}
+		<span>UNAUTH</span>
 		<img class="err-img" src={stopErr} alt="" role="presentation" width="150" height="210" />
 	{:else}
 		<!-- STOP Error image -->
@@ -23,13 +29,16 @@
 		{page.error?.message ?? 'An unexpected derailment occurred.'}
 	</p>

-	{#if page.error?.owlCode}
+	{#if page.error?.owlCode == 'NETWORK_DISCONNECTED'}
+		<p>THISISANETWORKERR</p>
+		<p>Operational data is unavaliable when offline</p>
+	{:else}
 		<div class="debug-info">
-			<code>Ref: {page.error.owlCode}</code>
+			<code>Ref: {page.error?.owlCode}</code>
 		</div>
 	{/if}

-	{#if $page.error?.owlCode === 'NETWORK_DISCONNECTED'}
+	{#if page.error?.owlCode === 'NETWORK_DISCONNECTED'}
 		<Button onclick={() => window.location.reload()} color={'accent'}>Retry</Button>
 	{:else}
 		<Button href={'/'} color={'accent'}>Return to Home</Button>
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -2,9 +2,9 @@
 	import { page } from '$app/state';
 	import { slide, fade } from 'svelte/transition';
 	import { onMount } from 'svelte';
+	import { browser } from '$app/environment';
 	import { navigating } from '$app/state';
 	import { LOCATIONS } from '$lib/locations-object.svelte';
-	import { nearestStationsState } from '$lib/geohash.svelte';

 	import Loading from '$lib/components/ui/Loading.svelte';
 	import TimezoneWarning from '$lib/components/ui/TimezoneWarning.svelte';
@@ -15,9 +15,21 @@
 	import logoPlain from '$lib/assets/round-logo.svg';
 	import favicon from '$lib/assets/round-logo.svg';

-	import { IconHome, IconDialpad, IconSettings, IconHelp, IconDots } from '@tabler/icons-svelte';
+	import { IconHome, IconDialpad, IconSettings, IconHelp, IconDots } from '@tabler/icons-svelte-runes';

-	onMount(() => LOCATIONS.init());
+	onMount(async () => {
+		LOCATIONS.init();
+		if (browser && 'serviceWorker' in navigator) {
+			try {
+				const registration = await navigator.serviceWorker.register('/service-worker.js', {
+					type: 'module'
+				});
+				console.info('OwlBoard Service Worker registered', registration.scope);
+			} catch (error) {
+				console.error('Service Worker installation failed: ', error);
+			}
+		}
+	});

 	let { children } = $props();

@@ -147,14 +159,14 @@
 	<h1 class="viewport-guard-title">Narrow Gauge Detected</h1>
 	<p>
 		Just as trains need the right track width, our data needs a bit more room to stay on the rails.
-		Please expand your view to at least 300px to view the app.
+		Please expand your view to at least 320px to view the app.
 	</p>
 </div>

 <style>
 	header {
 		top: 0;
-		height: 80px;
+		height: var(--header-height);
 		box-shadow: var(--shadow-std);
 	}
 	.logo-link {
@@ -201,13 +213,12 @@
 		min-height: 100dvh;
 		box-sizing: border-box;
 		background-color: var(--color-bg-dark);
-		background-image: radial-gradient(var(--color-bg-dark), var(--color-bg-light));
 	}

 	nav {
 		display: flex;
 		bottom: 0;
-		height: 60px;
+		height: var(--nav-height);
 		box-shadow: var(--shadow-up);
 	}

@@ -320,7 +331,7 @@
 		display: none;
 	}

-	@media (max-width: 299px) {
+	@media (max-width: 319px) {
 		.viewport-guard {
 			display: block;
 			position: fixed;
--- a/src/routes/about/+page.svelte
+++ b/src/routes/about/+page.svelte
@@ -11,13 +11,19 @@
 </script>

 <div class="logo-container">
-	<img
-		class="logo"
-		src={logo}
-		alt="OwlBoard Logo"
-		onclick={handleLogoTap}
-		class:animate={isSpinning}
-	/>
+    <button
+        type="button"
+        class="logo-btn"
+        onclick={handleLogoTap}
+        class:animate={isSpinning}
+        aria-label="Spin the OwlBoard logo"
+    >
+        <img
+            class="logo-img"
+            src={logo}
+            alt="OwlBoard Logo"
+        />
+    </button>
 </div>

 <section class="about">
@@ -59,6 +65,19 @@
 		text-align: center;
 	}

+	.logo-btn {
+        background: none;
+        border: none;
+        padding: 0;
+        cursor: pointer;
+        display: inline-block;
+        padding-top: 25px;
+        margin: auto;
+        width: clamp(80px, 20vw, 200px);
+    }
+
+
+
 	@keyframes owl-spin {
 		0% {
 			transform: rotate(0deg);
@@ -71,16 +90,15 @@
 		}
 	}

-	.logo {
-		padding-top: 25px;
-		margin: auto;
-		height: auto;
-		width: clamp(80px, 20vw, 200px);
-	}
+	.logo-img {
+        width: 100%;
+        height: auto;
+        display: block;
+    }

-	.logo.animate {
-		animation: owl-spin 0.8s cubic-bezier(0.34, 1.56, 0.64, 1) forwards;
-	}
+	.logo-btn.animate {
+        animation: owl-spin 0.8s cubic-bezier(0.34, 1.56, 0.64, 1) forwards;
+    }

 	section {
 		margin: auto;
--- a/src/routes/board/+page.svelte
+++ b/src/routes/board/+page.svelte
@@ -1,9 +1,10 @@
 <script lang="ts">
 	import { onMount, untrack } from 'svelte';
 	import { quickLinks } from '$lib/quick-links.svelte';
-	import StationAlertCard from '$lib/components/ui/cards/StationAlertCard.svelte';
+	import StationAlertCard from '$lib/components/ui/station-board/StationAlertCard.svelte';

 	import { formatUkDateTime, formatUkTime } from '$lib/utils/time';
+	import StaffServicesTable from '$lib/components/ui/station-board/StaffServicesTable.svelte';
 	let { data } = $props();
 	let now = $state(new Date());

@@ -13,7 +14,7 @@
 		}, 1000);

 		return () => clearInterval(interval);
-	})
+	});

 	// Update 'QuickLinks'
 	$effect(() => {
@@ -33,70 +34,64 @@
 	// Load Data Invalidation Handling
 	// Refresh countdown logic
 </script>
-<section class="board-wrapper">
-{#if data.boardData.data.m?.length}

-	<StationAlertCard messages={data.boardData.data.m} />
+<section class="board-wrapper">
 	<div class="time-data">
-		<span class="time-loaded">Fetched: {formatUkDateTime(data.boardData.producedAt, true)}</span>
+		<span class="time-loaded">Updated: {formatUkDateTime(data.boardData.producedAt, true)}</span>
 		<span class="time-now">{formatUkTime(now, true)}</span>
 	</div>
-
-{/if}
+	{#if data.boardData.data.m?.length}
+		<StationAlertCard messages={data.boardData.data.m} />
+	{/if}
+	{#if data.boardData.data.s?.length}
+		<div class="service-list-wrapper">
+			<StaffServicesTable services={data.boardData.data.s} />
+		</div>
+	{/if}
 </section>

-<section class="section-t">Live boards are not yet fully implemented on the server</section>
-
-<pre class="json-dump">{JSON.stringify(data.boardData.data.s, null, 2)}</pre>
-
 <style>
-.board-wrapper {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	width: 100%;
-	margin: 0 auto;
-	gap: 0;
-}
-
-.time-data {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	width: 90%;
-	max-width: 700px;
-	margin: 0 auto;
-	font-family: 'URW Gothic', sans-serif;
-}
-
-.time-loaded, .time-now {
-	font-variant-numeric: tabular-nums;
-}
-
-.time-loaded {
-	font-size: 0.9rem;
-}
-
-.time-now {
-	font-weight: 600;
-	font-size: 1rem;
-}
-	.section-t {
-		font-family: 'URW Gothic', sans-serif;
-		text-align: center;
-		font-size: 2rem;
-		width: 90%;
-		margin: auto;
-		padding-top: 25px;
-		max-width: 500px;
+	.board-wrapper {
+		display: flex;
+		height: calc(100dvh - var(--nav-height) - var(--header-height));
+		flex-direction: column;
+		align-items: center;
+		width: 100%;
+		margin: 0 auto;
+		overflow: hidden;
+		gap: 0;
 	}

-	.json-dump {
-		background: #222;
-		color: #0f0;
-		padding: 1rem;
-		border-radius: 4px;
+	.time-data {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		width: 90%;
+		max-width: 700px;
+		margin: 10px auto;
+		font-family: 'URW Gothic', sans-serif;
+	}
+
+	.time-loaded,
+	.time-now {
+		font-variant-numeric: tabular-nums;
+	}
+
+	.time-loaded {
 		font-size: 0.9rem;
-		width: 95%;
-		margin: 1rem auto;	}
+	}
+
+	.time-now {
+		font-weight: 600;
+		font-size: 1rem;
+	}
+
+	.service-list-wrapper {
+		flex: 1;
+		overflow-y: auto;
+		height: calc(100dvh - 60px);
+		width: 97%;
+		max-width: 700px;
+		margin-bottom: 5px;
+	}
 </style>
--- a/src/routes/board/+page.ts
+++ b/src/routes/board/+page.ts
@@ -35,30 +35,12 @@ export const load: PageLoad = async ({ url, fetch }) => {
 			boardData
 		};
 	} catch (e: unknown) {
-		if (
-			e instanceof TypeError &&
-			(e.message == 'Failed to fetch' || e.message.includes('network'))
-		) {
-			throw error(503, {
-				message: 'Network error: Please check your connection',
+		if (e instanceof TypeError && e.message === 'Failed to fetch') {
+			error(503, {
+				message: 'Cannot connect to the OwlBoard server',
 				owlCode: 'NETWORK_DISCONNECTED'
 			});
 		}
-		if (e instanceof ValidationError) {
-			throw error(400, { message: e.message, owlCode: 'VALIDATION_ERROR' });
-		} else if (e instanceof ApiError) {
-			// If the API returns 404, it means the backend doesn't recognize this CRS/TIPLOC
-			if (e.code === 'NOT_FOUND') {
-				throw error(404, {
-					message: `Location (${locId.toUpperCase()}) is not recognized by the server.`,
-					owlCode: 'LOCATION_NOT_IN_BACKEND'
-				});
-			}
-			throw error(e.status, { message: e.message, owlCode: 'API_ERROR' });
-		} else if (e instanceof Error) {
-			throw error(500, { message: e.message, owlCode: 'GEN_ERROR' });
-		}
-
-		throw error(500, { message: 'Unexpected error', owlCode: 'UNKNOWN_ERR' });
+		throw e;
 	}
 };
--- a/src/routes/pis/+page.svelte
+++ b/src/routes/pis/+page.svelte
@@ -2,7 +2,7 @@
 	import HeadcodeSearchCard from '$lib/components/ui/cards/HeadcodeSearchCard.svelte';
 	import PisStartEndCard from '$lib/components/ui/cards/pis/PisStartEndCard.svelte';
 	import PisCode from '$lib/components/ui/cards/pis/PisCode.svelte';
-	import Button from '$lib/components/ui/Button.svelte';
+	import Button from '$lib/components/ui/form-elements/Button.svelte';
 	import type { ApiPisObject } from '@owlboard/owlboard-ts';
 	import { OwlClient, ApiError, ValidationError } from '$lib/owlClient';
 	import TocStyle from '$lib/components/ui/TocStyle.svelte';
@@ -18,14 +18,14 @@
 		try {
 			const response = await OwlClient.pis.getByStartEndCrs(start, end);
 			results = response.data || [];
-		} catch (e) {
+		} catch (e: unknown) {
 			if (e instanceof ValidationError) {
 				errorState = { status: 400, message: e.message };
 			} else if (e instanceof ApiError) {
 				console.log(e);
 				errorState = { status: 20, message: e.message };
 			} else {
-				errorState = { status: 0, message: `Unknown Error: ${e.message}` };
+				errorState = { status: 0, message: `Unknown Error: ${e instanceof Error ? e.message : String(e)}` };
 			}
 		} finally {
 			resultsLoaded = true;
@@ -45,7 +45,7 @@
 				console.log(e);
 				errorState = { status: 20, message: e.message };
 			} else {
-				errorState = { status: 0, message: `Unknown Error: ${e.message}` };
+				errorState = { status: 0, message: `Unknown Error: ${e instanceof Error ? e.message : String(e)}` };
 			}
 		} finally {
 			resultsLoaded = true;
--- a/src/routes/trains/+page.ts
+++ b/src/routes/trains/+page.ts
@@ -29,34 +29,12 @@ export const load: PageLoad = async ({ fetch, url }) => {
 			results: results
 		};
 	} catch (e: unknown) {
-		if (e instanceof ValidationError) {
-			throw error(400, {
-				message: e.message,
-				owlCode: 'VALIDATION_ERROR'
-			});
-		} else if (e instanceof ApiError) {
-			// Check if NO_RESULTS error, and return empty array if that is the case
-			if (e.code === 'NOT_FOUND') {
-				return {
-					title: headcode.toUpperCase(),
-					results: []
-				};
-			} else {
-				throw error(e.status, {
-					message: e.message,
-					owlCode: 'API_ERROR'
-				});
-			}
-		} else if (e instanceof Error) {
-			throw error(500, {
-				message: e.message,
-				owlCode: 'GEN_ERROR'
-			});
-		} else {
-			throw error(500, {
-				message: 'Unexpected error',
-				owlCode: 'UNKNOWN_ERR'
+		if (e instanceof TypeError && e.message === 'Failed to fetch') {
+			error(503, {
+				message: 'Cannot connect to the OwlBoard server',
+				owlCode: 'NETWORK_DISCONNECTED'
 			});
 		}
+		throw e;
 	}
 };
--- a/src/service-worker.ts
+++ b/src/service-worker.ts
@@ -0,0 +1,121 @@
+/// <reference types="@sveltejs/kit" />
+/// <reference lib="webworker" />
+
+import type { ApiEnvelope } from '@owlboard/api-schema-types';
+import { build, files, version } from '$service-worker';
+
+const sw = self as unknown as ServiceWorkerGlobalScope;
+const CACHE_NAME = `owlboard-cache-${version}`;
+const ASSETS = [
+	...build,
+	...files.filter((file) => !file.endsWith('manifest.json') && !file.startsWith('/icons/')),
+	'/'
+];
+
+sw.addEventListener('install', (event) => {
+	sw.skipWaiting();
+	event.waitUntil(caches.open(CACHE_NAME).then((cache) => cache.addAll(ASSETS)));
+});
+
+sw.addEventListener('activate', (event) => {
+	event.waitUntil(
+		Promise.all([
+			caches.keys().then((keys) => {
+				return Promise.all(
+					keys.filter((key) => key !== CACHE_NAME).map((key) => caches.delete(key))
+				);
+			}),
+			sw.clients.claim()
+		])
+	);
+});
+
+sw.addEventListener('fetch', (event) => {
+	const { request } = event;
+	if (request.method !== 'GET') return;
+
+	const url = new URL(request.url);
+
+	// Uncached static assets
+	if (url.pathname.endsWith('manifest.json') || url.pathname.includes('/icons/')) {
+		event.respondWith(fetch(request));
+		return;
+	}
+
+	// Static Assets (Cache-First)
+	if (ASSETS.includes(url.pathname) || url.pathname.startsWith('/_app/')) {
+		event.respondWith(caches.match(request).then((res) => res || fetch(request)));
+		return;
+	}
+
+	// Cachable API Responses - stale-while-revalidate
+	if (url.pathname === '/api/v3/locationFilter/data') {
+		event.respondWith(
+			caches.open('ob-dynamic-cache').then(async (cache) => {
+				const cachedResponse = await cache.match(request);
+
+				// Ensure fallback response exists
+				const makeOfflineFallback = () => {
+					const errorObject: ApiEnvelope.Envelope = {
+						e: {
+							code: 'NETWORK_DISCONNECTED',
+							msg: 'Cannot connect to the OwlBoard server'
+						},
+						t: Math.floor(Date.now() / 1000)
+					};
+					return new Response(JSON.stringify(errorObject), {
+						status: 503,
+						headers: { 'Content-Type': 'application/json' }
+					});
+				};
+
+				const networkFetch = fetch(request)
+					.then((networkResponse) => {
+						if (networkResponse.ok) {
+							cache.put(request, networkResponse.clone());
+						}
+						return networkResponse;
+					})
+					.catch(() => {
+						// If offline & cache empty, return fallback
+						return makeOfflineFallback();
+					});
+
+				// If cachedResponse is undefined, networkFetch safely resolves to a Response
+				return cachedResponse || networkFetch;
+			})
+		);
+		return;
+	}
+
+	// Offline API Fallback (Network-First)
+	if (url.pathname.startsWith('/api') || url.hostname.includes('api')) {
+		event.respondWith(
+			fetch(request).catch(() => {
+				const errorObject: ApiEnvelope.Envelope = {
+					e: {
+						code: 'NETWORK_DISCONNECTED',
+						msg: 'Cannot connect to the OwlBoard server'
+					},
+					t: Math.floor(Date.now() / 1000)
+				};
+				return new Response(JSON.stringify(errorObject), {
+					status: 503,
+					headers: { 'Content-Type': 'application/json' }
+				});
+			})
+		);
+		return;
+	}
+
+	// Nav fallback - return fallback page, if offline and page requested
+	if (request.mode === 'navigate' || request.headers.get('accept')?.includes('text/html')) {
+		event.respondWith(
+			fetch(request).catch(() => {
+				// Serve svelte fallback page
+				return caches.match('/') as Promise<Response>;
+			})
+		);
+		return;
+	}
+});
--- a/static/icons/apple-touch-icon.png
+++ b/static/icons/apple-touch-icon.png
--- a/static/icons/icon-192.png
+++ b/static/icons/icon-192.png
--- a/static/icons/icon-512.png
+++ b/static/icons/icon-512.png
--- a/static/icons/maskable-512.png
+++ b/static/icons/maskable-512.png
--- a/static/manifest.json
+++ b/static/manifest.json
@@ -0,0 +1,62 @@
+{
+    "name": "OwlBoard",
+    "short_name": "OwlBoard",
+    "description": "Real-time UK rail data and operational tools for staff and enthusiasts.",
+    "id": "/",
+    "start_url": "/",
+    "scope": "/",
+    "display": "standalone",
+    "display_override": [
+        "window-controls-overlay",
+        "standalone",
+        "minimal-ui"
+    ],
+    "background_color": "#404c55",
+    "theme_color": "#4fd1d1",
+    "orientation": "portrait",
+    "categories": [
+        "transportation",
+        "utilities"
+    ],
+    "dir": "ltr",
+    "lang": "en-GB",
+    "prefer_related_applications": false,
+    "icons": [
+        {
+            "src": "/icons/icon-192.png",
+            "sizes": "192x192",
+            "type": "image/png",
+            "purpose": "any"
+        },
+        {
+            "src": "/icons/icon-512.png",
+            "sizes": "512x512",
+            "type": "image/png",
+            "purpose": "any"
+        },
+        {
+            "src": "/icons/maskable-512.png",
+            "sizes": "512x512",
+            "type": "image/png",
+            "purpose": "maskable"
+        }
+    ],
+    "shortcuts": [
+        {
+            "name": "Find PIS",
+            "short_name": "PIS",
+            "description": "Find PIS Codes fast",
+            "url": "/pis",
+            "icons": [
+                {
+                    "src": "/icons/icon-192.png",
+                    "sizes": "192x192"
+                }
+            ]
+        }
+    ],
+    "handle_links": "preferred",
+    "launch_handler": {
+        "client_mode": "focus-existing"
+    }
+}
--- a/static/type/inconsolata/latin-wdth-normal.woff2
+++ b/static/type/inconsolata/latin-wdth-normal.woff2
Author	SHA1	Message	Date
Fred Boniface	6ed262ce59	Bugfix: - Update to @tabler/icons-svelte-runes for a more 'Svente 5' experience. - Adjust error handling in load functions, plain error thrown for handling in the error handler. - Fix the warning regarding a click handler attached to an <img> on the About page - Re-organise component directory - Remove unused font declarations from global.css Features: - Add service-worker caching of FilterData API response to allow for filtering to work fully offline -	2026-05-15 21:19:12 +01:00
Fred Boniface	6faa620bdb	Adjust styling of 'estimated times'	2026-05-15 18:58:45 +01:00
Fred Boniface	1105a9f7c5	Add extra message to +error.svelte to handle, and clarify 'OFFLINE' error.	2026-05-14 19:43:22 +01:00
Fred Boniface	25b64edabd	Add features: - manifest.json with PNG icon set. - reset option against QuickLinks storage - 'Preferences' store, ready for preferences page - including location boolean... Important! - Minor service-worker improvements for better offline fallbacks	2026-05-14 19:39:05 +01:00
Fred Boniface	bc56e66178	Add initlal service-worker with basic offline handling. Manifest is not yet present.	2026-05-13 20:47:01 +01:00
Fred Boniface	0ef9e5b56f	Adjust dynamic styles on the departure board component	2026-05-12 20:35:12 +01:00
Fred Boniface	b88f4f3b35	Dynamically adjust font size based on vw value	2026-05-12 19:06:25 +01:00
Fred Boniface	a2e6f3b99a	Switch departure board to use Inconsolata monospaced font (varying widths, weights, etc.)	2026-05-11 20:28:22 +01:00
Fred Boniface	7edccf294b	Update table display on board page, in preparation for offering different 'table' styles.	2026-05-11 12:04:40 +01:00
Fred Boniface	13d22d7b73	Add initial departure board table 'skeleton', very basic at present	2026-05-10 20:57:50 +01:00
Fred Boniface	59e8a77d3d	Change 'Fetched' to 'Updated' on the Board page fetch time	2026-05-10 00:27:45 +01:00
Fred Boniface	1f1e215c0c	Fix layout shifts with the temporary <pre> element on the board page	2026-05-10 00:26:21 +01:00
				`@@ -0,0 +1 @@`
				<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" viewBox="0 0 562.1 562.1"><defs><radialGradient xlink:href="#a" id="b" cx="256" cy="256" r="254" fx="256" fy="256" gradientTransform="translate(27 27)" gradientUnits="userSpaceOnUse"/><linearGradient id="a"><stop offset="0" stop-color="#2b343c"/><stop offset="1" stop-color="#404c55"/></linearGradient></defs><path fill="url(#b)" d="M694.3 283a411.3 394 0 0 1-410.7 394 411.3 394 0 0 1-412-392.8 411.3 394 0 0 1 409.5-395.1 411.3 394 0 0 1 413.2 391.4" transform="translate(-2 -2)"/><path fill="#4fd1d1" d="M281 81a200 200 0 0 0-153.4 71.8 120 120 0 0 0 50.5 25.8c9 2.3 8.9 2.3 15.6-.6 50-21.6 124.4-21.6 175.2-.1 13.3 5.6 44.6-6.5 65.9-24.8a200 200 0 0 0-153.8-72m-161.9 82.7a200 200 0 0 0-38 117.3 200 200 0 0 0 200 200 200 200 0 0 0 200-200 200 200 0 0 0-37.8-116.8 96 96 0 0 1-17.7 46.6l-2.8 4 1.3 1.8c73.3 99.2-14.3 222.2-116.7 163.6-2.5-1.4-4.7-2.4-5-2.1s-10.5 19.6-18 34c-3.4 6.5-2.7 6.6-6.3-.3-9.2-17.5-18-34-18.3-34-.1 0-2.3 1-4.7 2.5-101.3 58-190.7-65.7-117.4-162.4q2.3-3 1.8-3.6a102 102 0 0 1-20.4-50.6m86.5 57q-14.6 0-29.8 7.5C108 261.8 143.1 366.4 217.5 352a68 68 0 0 0 43.3-28.4c2.4-3.4 3.3-4.2 3.7-3.7l8.5 14.6c9.4 16.3 8 15 11.4 9 5.1-9 13.7-23.5 14-24 .3-.2 1.9 1.8 3.6 4.3 31 45.5 101.6 35.6 118.3-16.5a66.4 66.4 0 0 0-83.9-83c-23.3 7.7-38.7 24.4-53.8 58.4l-1.3 3-2.7-6c-17-38.5-43.7-59.5-73-59.2m147.2 34.7a32 32 0 0 1 23.7 9.5c22.8 22.8.7 60.8-30.9 53.1a32 32 0 0 1-23.2-37.3 31.5 31.5 0 0 1 30.4-25.3m-145.8 0c16.4-.8 32.7 11 33.9 30.1a32.2 32.2 0 0 1-40.1 32.5 31.5 31.5 0 0 1-15-52.9 32 32 0 0 1 21.2-9.6m12 9.6q-3.3 0-5.8 3c-6.3 7.4 2.5 17.7 11 13a9 9 0 0 0 4.2-7.5c0-5.4-4.8-8.9-9.4-8.5m123.1 0c-6 .5-9.6 6.5-7 12.3 2 4.5 8.3 6.3 12.2 3.6 7.2-4.9 4.7-15.3-4-15.8z"/></svg>