diff --git a/package-lock.json b/package-lock.json
index 2ccd4d9..f452e2a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -57,6 +57,20 @@
       "integrity": "sha512-Elp+iwUx5rN5+Y8xLt5/GRoG20WGoDCQ/1Fb+1LiGtvwbDavuSk0jhD/eZdckHAuzcDzccnkv+rEjyWfRx18gg==",
       "dev": true
     },
+    "node_modules/@ampproject/remapping": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+      "license": "Apache-2.0",
+      "peer": true,
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/@asamuzakjp/css-color": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.2.0.tgz",
@@ -224,7 +238,6 @@
       "cpu": [
         "ppc64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "aix"
@@ -240,7 +253,6 @@
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "android"
@@ -256,7 +268,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "android"
@@ -272,7 +283,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "android"
@@ -288,7 +298,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "darwin"
@@ -304,7 +313,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "darwin"
@@ -320,7 +328,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "freebsd"
@@ -336,7 +343,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "freebsd"
@@ -352,7 +358,6 @@
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -368,7 +373,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -384,7 +388,6 @@
       "cpu": [
         "ia32"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -400,7 +403,6 @@
       "cpu": [
         "loong64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -416,7 +418,6 @@
       "cpu": [
         "mips64el"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -432,7 +433,6 @@
       "cpu": [
         "ppc64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -448,7 +448,6 @@
       "cpu": [
         "riscv64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -464,7 +463,6 @@
       "cpu": [
         "s390x"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -480,7 +478,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -496,7 +493,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "netbsd"
@@ -512,7 +508,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "netbsd"
@@ -528,7 +523,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "openbsd"
@@ -544,7 +538,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "openbsd"
@@ -560,7 +553,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "openharmony"
@@ -576,7 +568,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "sunos"
@@ -592,7 +583,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "win32"
@@ -608,7 +598,6 @@
       "cpu": [
         "ia32"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "win32"
@@ -624,7 +613,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "win32"
@@ -659,7 +647,6 @@
       "version": "3.10.0",
       "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.10.0.tgz",
       "integrity": "sha512-oxDR/NTEJ1k+UFVQElaNIk65E/Z83HK1z1WI3lQyhTtnNg4R5oVXaPzK3jcpKG8UHKDVuDQHzn+wsxSz8RP3aw==",
-      "dev": true,
       "dependencies": {
         "@swc/helpers": "^0.5.0"
       }
@@ -681,7 +668,6 @@
       "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,
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.5.0",
         "@jridgewell/trace-mapping": "^0.3.24"
@@ -691,7 +677,6 @@
       "version": "2.3.5",
       "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz",
       "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==",
-      "dev": true,
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.24"
@@ -701,7 +686,6 @@
       "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,
       "engines": {
         "node": ">=6.0.0"
       }
@@ -709,14 +693,12 @@
     "node_modules/@jridgewell/sourcemap-codec": {
       "version": "1.5.5",
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
-      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
-      "dev": true
+      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og=="
     },
     "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,
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
@@ -852,8 +834,7 @@
     "node_modules/@polka/url": {
       "version": "1.0.0-next.29",
       "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.29.tgz",
-      "integrity": "sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==",
-      "dev": true
+      "integrity": "sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww=="
     },
     "node_modules/@redis/bloom": {
       "version": "1.2.0",
@@ -1007,7 +988,6 @@
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "android"
@@ -1020,7 +1000,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "android"
@@ -1033,7 +1012,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "darwin"
@@ -1046,7 +1024,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "darwin"
@@ -1059,7 +1036,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "freebsd"
@@ -1072,7 +1048,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "freebsd"
@@ -1085,7 +1060,6 @@
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -1098,7 +1072,6 @@
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -1111,7 +1084,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -1124,7 +1096,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -1137,7 +1108,6 @@
       "cpu": [
         "loong64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -1150,7 +1120,6 @@
       "cpu": [
         "ppc64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -1163,7 +1132,6 @@
       "cpu": [
         "riscv64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -1176,7 +1144,6 @@
       "cpu": [
         "riscv64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -1189,7 +1156,6 @@
       "cpu": [
         "s390x"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -1202,7 +1168,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -1215,7 +1180,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -1228,7 +1192,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "openharmony"
@@ -1241,7 +1204,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "win32"
@@ -1254,7 +1216,6 @@
       "cpu": [
         "ia32"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "win32"
@@ -1267,7 +1228,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "win32"
@@ -1280,7 +1240,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "win32"
@@ -1341,14 +1300,12 @@
     "node_modules/@standard-schema/spec": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.0.0.tgz",
-      "integrity": "sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA==",
-      "dev": true
+      "integrity": "sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA=="
     },
     "node_modules/@sveltejs/acorn-typescript": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/@sveltejs/acorn-typescript/-/acorn-typescript-1.0.7.tgz",
       "integrity": "sha512-znp1A/Y1Jj4l/Zy7PX5DZKBE0ZNY+5QBngiE21NJkfSTyzzC5iKNWOtwFXKtIrn7MXEFBck4jD95iBNkGjK92Q==",
-      "dev": true,
       "peerDependencies": {
         "acorn": "^8.9.0"
       }
@@ -1381,7 +1338,6 @@
       "version": "2.49.0",
       "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.49.0.tgz",
       "integrity": "sha512-oH8tXw7EZnie8FdOWYrF7Yn4IKrqTFHhXvl8YxXxbKwTMcD/5NNCryUSEXRk2ZR4ojnub0P8rNrsVGHXWqIDtA==",
-      "dev": true,
       "dependencies": {
         "@standard-schema/spec": "^1.0.0",
         "@sveltejs/acorn-typescript": "^1.0.5",
@@ -1419,7 +1375,6 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-5.1.1.tgz",
       "integrity": "sha512-Y1Cs7hhTc+a5E9Va/xwKlAJoariQyHY+5zBgCZg4PFWNYQ1nMN9sjK1zhw1gK69DuqVP++sht/1GZg1aRwmAXQ==",
-      "dev": true,
       "dependencies": {
         "@sveltejs/vite-plugin-svelte-inspector": "^4.0.1",
         "debug": "^4.4.1",
@@ -1440,7 +1395,6 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte-inspector/-/vite-plugin-svelte-inspector-4.0.1.tgz",
       "integrity": "sha512-J/Nmb2Q2y7mck2hyCX4ckVHcR5tu2J+MtBEQqpDrrgELZ2uvraQcK/ioCV61AqkdXFgriksOKIceDcQmqnGhVw==",
-      "dev": true,
       "dependencies": {
         "debug": "^4.3.7"
       },
@@ -1457,7 +1411,6 @@
       "version": "0.5.17",
       "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.17.tgz",
       "integrity": "sha512-5IKx/Y13RsYd+sauPb2x+U/xZikHjolzfuDgTAl/Tdf3Q8rslRvC19NKDLgAJQ6wsqADk10ntlv08nPFw/gO/A==",
-      "dev": true,
       "dependencies": {
         "tslib": "^2.8.0"
       }
@@ -1840,8 +1793,7 @@
     "node_modules/@types/cookie": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz",
-      "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==",
-      "dev": true
+      "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA=="
     },
     "node_modules/@types/deep-eql": {
       "version": "4.0.2",
@@ -1852,8 +1804,7 @@
     "node_modules/@types/estree": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
-      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
-      "dev": true
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w=="
     },
     "node_modules/@types/linkify-it": {
       "version": "5.0.0",
@@ -2521,7 +2472,6 @@
       "version": "8.15.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
-      "dev": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -2577,7 +2527,6 @@
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.2.tgz",
       "integrity": "sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==",
-      "dev": true,
       "engines": {
         "node": ">= 0.4"
       }
@@ -2632,7 +2581,6 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz",
       "integrity": "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==",
-      "dev": true,
       "engines": {
         "node": ">= 0.4"
       }
@@ -2846,6 +2794,30 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/code-red": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/code-red/-/code-red-1.0.4.tgz",
+      "integrity": "sha512-7qJWqItLA8/VPVlKJlFXU+NBlo/qyfs39aJcuMT/2ere32ZqvF5OSxgdM5xOfJJ7O429gg2HM47y8v9P+9wrNw==",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.4.15",
+        "@types/estree": "^1.0.1",
+        "acorn": "^8.10.0",
+        "estree-walker": "^3.0.3",
+        "periscopic": "^3.1.0"
+      }
+    },
+    "node_modules/code-red/node_modules/estree-walker": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
+      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@types/estree": "^1.0.0"
+      }
+    },
     "node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -2880,11 +2852,24 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
       "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
-      "dev": true,
       "engines": {
         "node": ">= 0.6"
       }
     },
+    "node_modules/css-tree": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
+      "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "mdn-data": "2.0.30",
+        "source-map-js": "^1.0.1"
+      },
+      "engines": {
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
+      }
+    },
     "node_modules/css.escape": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz",
@@ -2978,7 +2963,6 @@
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
       "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3003,7 +2987,7 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
       "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
-      "dev": true,
+      "devOptional": true,
       "engines": {
         "node": ">=8"
       }
@@ -3011,8 +2995,7 @@
     "node_modules/devalue": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/devalue/-/devalue-5.5.0.tgz",
-      "integrity": "sha512-69sM5yrHfFLJt0AZ9QqZXGCPfJ7fQjvpln3Rq5+PS03LD32Ost1Q9N+eEnaQwGRIriKkMImXD56ocjQmfjbV3w==",
-      "dev": true
+      "integrity": "sha512-69sM5yrHfFLJt0AZ9QqZXGCPfJ7fQjvpln3Rq5+PS03LD32Ost1Q9N+eEnaQwGRIriKkMImXD56ocjQmfjbV3w=="
     },
     "node_modules/dom-accessibility-api": {
       "version": "0.6.3",
@@ -3072,7 +3055,6 @@
       "version": "0.25.12",
       "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.12.tgz",
       "integrity": "sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg==",
-      "dev": true,
       "hasInstallScript": true,
       "bin": {
         "esbuild": "bin/esbuild"
@@ -3127,7 +3109,6 @@
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/esrap/-/esrap-2.1.3.tgz",
       "integrity": "sha512-T/Dhhv/QH+yYmiaLz9SA3PW+YyenlnRKDNdtlYJrSOBmNsH4nvPux+mTwx7p+wAedlJrGoZtXNI0a0MjQ2QkVg==",
-      "dev": true,
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.4.15"
       }
@@ -3156,7 +3137,6 @@
       "version": "6.5.0",
       "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
       "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
-      "dev": true,
       "engines": {
         "node": ">=12.0.0"
       },
@@ -3186,7 +3166,6 @@
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [
@@ -3366,7 +3345,7 @@
       "version": "2.6.1",
       "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.6.1.tgz",
       "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==",
-      "dev": true,
+      "devOptional": true,
       "bin": {
         "jiti": "lib/jiti-cli.mjs"
       }
@@ -3455,7 +3434,6 @@
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz",
       "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -3616,7 +3594,7 @@
       "version": "1.30.2",
       "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.30.2.tgz",
       "integrity": "sha512-utfs7Pr5uJyyvDETitgsaqSyjCb2qNRAtuqUeWIAKztsOYdcACf2KtARYXg2pSvhkt+9NfoaNY7fxjl6nuMjIQ==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "detect-libc": "^2.0.3"
       },
@@ -3648,7 +3626,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "android"
@@ -3668,7 +3645,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "darwin"
@@ -3688,7 +3664,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "darwin"
@@ -3708,7 +3683,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "freebsd"
@@ -3728,7 +3702,6 @@
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -3748,7 +3721,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -3768,7 +3740,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -3788,7 +3759,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -3808,7 +3778,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -3828,7 +3797,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "win32"
@@ -3848,7 +3816,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "win32"
@@ -3872,8 +3839,7 @@
     "node_modules/locate-character": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/locate-character/-/locate-character-3.0.0.tgz",
-      "integrity": "sha512-SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA==",
-      "dev": true
+      "integrity": "sha512-SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA=="
     },
     "node_modules/lodash.defaults": {
       "version": "4.2.0",
@@ -3909,7 +3875,6 @@
       "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,
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.5.5"
       }
@@ -3930,6 +3895,13 @@
         "markdown-it": "bin/markdown-it.mjs"
       }
     },
+    "node_modules/mdn-data": {
+      "version": "2.0.30",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
+      "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
+      "license": "CC0-1.0",
+      "peer": true
+    },
     "node_modules/mdurl": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz",
@@ -3957,7 +3929,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz",
       "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==",
-      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -3966,7 +3937,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.1.tgz",
       "integrity": "sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       }
@@ -3988,7 +3958,6 @@
       "version": "3.3.11",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
       "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -4139,17 +4108,47 @@
         "node": ">= 14.16"
       }
     },
+    "node_modules/periscopic": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/periscopic/-/periscopic-3.1.0.tgz",
+      "integrity": "sha512-vKiQ8RRtkl9P+r/+oefh25C3fhybptkHKCZSPlcXiJux2tJF55GnEj3BVn4A5gKfq9NWWXXrxkHBwVPUfH0opw==",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@types/estree": "^1.0.0",
+        "estree-walker": "^3.0.0",
+        "is-reference": "^3.0.0"
+      }
+    },
+    "node_modules/periscopic/node_modules/estree-walker": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
+      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@types/estree": "^1.0.0"
+      }
+    },
+    "node_modules/periscopic/node_modules/is-reference": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.3.tgz",
+      "integrity": "sha512-ixkJoqQvAP88E6wLydLGGqCJsrFUnqoH6HnaczB8XmDH1oaWU+xxdptvikTgaEhtZ53Ky6YXiBuUI2WXLMCwjw==",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@types/estree": "^1.0.6"
+      }
+    },
     "node_modules/picocolors": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
-      "dev": true
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
     },
     "node_modules/picomatch": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-      "dev": true,
       "engines": {
         "node": ">=12"
       },
@@ -4191,7 +4190,6 @@
       "version": "8.5.6",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
       "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
-      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -4483,7 +4481,6 @@
       "version": "4.53.3",
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.53.3.tgz",
       "integrity": "sha512-w8GmOxZfBmKknvdXU1sdM9NHcoQejwF/4mNgj2JuEEdRaHwwF12K7e9eXn1nLZ07ad+du76mkVsyeb2rKGllsA==",
-      "dev": true,
       "dependencies": {
         "@types/estree": "1.0.8"
       },
@@ -4553,7 +4550,6 @@
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/sade/-/sade-1.8.1.tgz",
       "integrity": "sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==",
-      "dev": true,
       "dependencies": {
         "mri": "^1.1.0"
       },
@@ -4593,8 +4589,7 @@
     "node_modules/set-cookie-parser": {
       "version": "2.7.2",
       "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.2.tgz",
-      "integrity": "sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw==",
-      "dev": true
+      "integrity": "sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw=="
     },
     "node_modules/siginfo": {
       "version": "2.0.0",
@@ -4611,7 +4606,6 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/sirv/-/sirv-3.0.2.tgz",
       "integrity": "sha512-2wcC/oGxHis/BoHkkPwldgiPSYcpZK3JU28WoMVv55yHJgcZ8rlXvuG9iZggz+sU1d4bRgIGASwyWqjxu3FM0g==",
-      "dev": true,
       "dependencies": {
         "@polka/url": "^1.0.0-next.24",
         "mrmime": "^2.0.0",
@@ -4625,7 +4619,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
       "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4712,7 +4705,6 @@
       "version": "5.43.14",
       "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.43.14.tgz",
       "integrity": "sha512-pHeUrp1A5S6RGaXhJB7PtYjL1VVjbVrJ2EfuAoPu9/1LeoMaJa/pcdCsCSb0gS4eUHAHnhCbUDxORZyvGK6kOQ==",
-      "dev": true,
       "dependencies": {
         "@jridgewell/remapping": "^2.3.4",
         "@jridgewell/sourcemap-codec": "^1.5.0",
@@ -4766,6 +4758,52 @@
         "svelte-kit-sessions": "^0.0.6"
       }
     },
+    "node_modules/svelte-kit-connect-redis/node_modules/estree-walker": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
+      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@types/estree": "^1.0.0"
+      }
+    },
+    "node_modules/svelte-kit-connect-redis/node_modules/is-reference": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.3.tgz",
+      "integrity": "sha512-ixkJoqQvAP88E6wLydLGGqCJsrFUnqoH6HnaczB8XmDH1oaWU+xxdptvikTgaEhtZ53Ky6YXiBuUI2WXLMCwjw==",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@types/estree": "^1.0.6"
+      }
+    },
+    "node_modules/svelte-kit-connect-redis/node_modules/svelte": {
+      "version": "4.2.20",
+      "resolved": "https://registry.npmjs.org/svelte/-/svelte-4.2.20.tgz",
+      "integrity": "sha512-eeEgGc2DtiUil5ANdtd8vPwt9AgaMdnuUFnPft9F5oMvU/FHu5IHFic+p1dR/UOB7XU2mX2yHW+NcTch4DCh5Q==",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@ampproject/remapping": "^2.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.15",
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "@types/estree": "^1.0.1",
+        "acorn": "^8.9.0",
+        "aria-query": "^5.3.0",
+        "axobject-query": "^4.0.0",
+        "code-red": "^1.0.3",
+        "css-tree": "^2.3.1",
+        "estree-walker": "^3.0.3",
+        "is-reference": "^3.0.1",
+        "locate-character": "^3.0.0",
+        "magic-string": "^0.30.4",
+        "periscopic": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
     "node_modules/svelte-kit-connect-redis/node_modules/svelte-kit-sessions": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/svelte-kit-sessions/-/svelte-kit-sessions-0.0.6.tgz",
@@ -4813,7 +4851,6 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.3.tgz",
       "integrity": "sha512-ixkJoqQvAP88E6wLydLGGqCJsrFUnqoH6HnaczB8XmDH1oaWU+xxdptvikTgaEhtZ53Ky6YXiBuUI2WXLMCwjw==",
-      "dev": true,
       "dependencies": {
         "@types/estree": "^1.0.6"
       }
@@ -4864,7 +4901,6 @@
       "version": "0.2.15",
       "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
       "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
-      "dev": true,
       "dependencies": {
         "fdir": "^6.5.0",
         "picomatch": "^4.0.3"
@@ -4925,7 +4961,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
       "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -4957,8 +4992,7 @@
     "node_modules/tslib": {
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-      "dev": true
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
     },
     "node_modules/typescript": {
       "version": "5.9.3",
@@ -5031,7 +5065,6 @@
       "version": "6.4.1",
       "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.1.tgz",
       "integrity": "sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==",
-      "dev": true,
       "dependencies": {
         "esbuild": "^0.25.0",
         "fdir": "^6.4.4",
@@ -5127,7 +5160,6 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [
@@ -5141,7 +5173,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/vitefu/-/vitefu-1.1.1.tgz",
       "integrity": "sha512-B/Fegf3i8zh0yFbpzZ21amWzHmuNlLlmJT6n7bu5e+pCHUKQIfXSYokrqOBGEMMe9UG2sostKQF9mml/vYaWJQ==",
-      "dev": true,
       "workspaces": [
         "tests/deps/*",
         "tests/projects/*",
@@ -5303,7 +5334,7 @@
       "version": "8.18.3",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
       "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
-      "dev": true,
+      "devOptional": true,
       "engines": {
         "node": ">=10.0.0"
       },
@@ -5354,8 +5385,7 @@
     "node_modules/zimmerframe": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/zimmerframe/-/zimmerframe-1.1.4.tgz",
-      "integrity": "sha512-B58NGBEoc8Y9MWWCQGl/gq9xBCe4IiKM0a2x7GZdQKOW5Exr8S1W24J6OgM1njK8xCRGvAJIL/MxXHf6SkmQKQ==",
-      "dev": true
+      "integrity": "sha512-B58NGBEoc8Y9MWWCQGl/gq9xBCe4IiKM0a2x7GZdQKOW5Exr8S1W24J6OgM1njK8xCRGvAJIL/MxXHf6SkmQKQ=="
     },
     "node_modules/zod": {
       "version": "3.25.76",
diff --git a/src/hooks.server.ts b/src/hooks.server.ts
index 9a2f994..502d028 100644
--- a/src/hooks.server.ts
+++ b/src/hooks.server.ts
@@ -10,7 +10,6 @@ import { env } from "$env/dynamic/private";
 import { oauth2ProviderManager } from "$lib/oauth/providerManager";
 import { SessionOAuthHelper } from "$lib/oauth/sessionHelper";
 import { resourceDocsCache } from "$lib/stores/resourceDocsCache";
-
 // Constants
 const DEFAULT_PORT = 3003;
 
@@ -18,7 +17,7 @@ const DEFAULT_PORT = 3003;
 function checkServerPort() {
   // Check common port environment variables
   const envPort =
-    process.env.PORT || process.env.VITE_PORT || process.env.SERVER_PORT;
+    env.PORT || env.VITE_PORT || env.SERVER_PORT;
 
   if (envPort && parseInt(envPort) !== DEFAULT_PORT) {
     logger.warn(
diff --git a/src/lib/components/Navigation.svelte b/src/lib/components/Navigation.svelte
index 3a960e6..bfd4a58 100644
--- a/src/lib/components/Navigation.svelte
+++ b/src/lib/components/Navigation.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { page } from "$app/stores";
   import { goto } from "$app/navigation";
-  import { configHelpers } from "$lib/config";
+  import { env } from "$env/dynamic/public";
 
   // Props from layout with better typing
   let {
@@ -21,7 +21,18 @@
   // Reactive statements for better state management
   let isAuthenticated = $derived(!!user && !!authInfo?.authenticated);
   let userDisplayName = $derived(user?.username || user?.email || "User");
-  let obpInfo = $derived(configHelpers.getObpConnectionInfo());
+  
+  // Configuration - extract display name from URL
+  function getDisplayName(url: string): string {
+    try {
+      const parsed = new URL(url);
+      return `${parsed.hostname}:${parsed.port || (parsed.protocol === 'https:' ? '443' : '80')}`;
+    } catch {
+      return url;
+    }
+  }
+  
+  let obpDisplayName = $derived(getDisplayName(env.PUBLIC_OBP_BASE_URL || "http://127.0.0.1:8080"));
 
   let isMobileMenuOpen = $state(false);
   let openDropdown = $state<string | null>(null);
@@ -183,7 +194,7 @@
         <div class="user-info desktop-only">
           <div class="user-details">
             <span class="user-name">{userDisplayName}</span>
-            <span class="obp-host">→ {obpInfo.displayName}</span>
+            <span class="obp-host">→ {obpDisplayName}</span>
           </div>
         </div>
 
@@ -228,7 +239,7 @@
         <!-- User Info in Mobile -->
         <div class="mobile-user-info">
           <div class="mobile-user-name">{userDisplayName}</div>
-          <div class="mobile-obp-host">Connected to: {obpInfo.displayName}</div>
+          <div class="mobile-obp-host">Connected to: {obpDisplayName}</div>
         </div>
 
         <!-- Navigation Links -->
diff --git a/src/lib/components/ObpStatusIndicator.svelte b/src/lib/components/ObpStatusIndicator.svelte
index a254152..9a8a7af 100644
--- a/src/lib/components/ObpStatusIndicator.svelte
+++ b/src/lib/components/ObpStatusIndicator.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { configHelpers } from "$lib/config";
+  import { env } from "$env/dynamic/public";
 
   // Props
   export let hasApiAccess: boolean = false;
@@ -7,8 +7,17 @@
   export let showDetails: boolean = false;
   export let inline: boolean = false;
 
-  // Configuration
-  $: obpInfo = configHelpers.getObpConnectionInfo();
+  // Configuration - extract display name from URL
+  function getDisplayName(url: string): string {
+    try {
+      const parsed = new URL(url);
+      return `${parsed.hostname}:${parsed.port || (parsed.protocol === 'https:' ? '443' : '80')}`;
+    } catch {
+      return url;
+    }
+  }
+  
+  $: displayName = getDisplayName(env.PUBLIC_OBP_BASE_URL || "http://127.0.0.1:8080");
   $: connectionStatus = hasApiAccess ? "connected" : "disconnected";
   $: statusColor = hasApiAccess ? "#10b981" : "#ef4444";
   $: statusIcon = hasApiAccess ? "🟢" : "🔴";
@@ -46,7 +55,7 @@
 <div
   class="status-indicator {currentSize.container}"
   class:inline={inline}
-  title="OBP Server: {obpInfo.displayName} - {statusText}"
+  title="OBP Server: {displayName} - {statusText}"
 >
   <!-- Status Dot with Animation -->
   <div
@@ -67,7 +76,7 @@
       <div class="status-details {currentSize.details}">
         <div class="detail-row">
           <span class="detail-label">Host:</span>
-          <span class="detail-value">{obpInfo.displayName}</span>
+          <span class="detail-value">{displayName}</span>
         </div>
         <div class="detail-row">
           <span class="detail-label">Status:</span>
diff --git a/src/lib/config.ts b/src/lib/config.ts
deleted file mode 100644
index 0f98ecb..0000000
--- a/src/lib/config.ts
+++ /dev/null
@@ -1,209 +0,0 @@
-import { env } from "$env/dynamic/public";
-import { browser } from "$app/environment";
-
-// Application configuration interface
-export interface AppConfiguration {
-  obp: {
-    baseUrl: string;
-    apiUrl: string;
-    oidcUrl: string;
-    host: string;
-    port: number;
-  };
-  app: {
-    baseUrl: string;
-    port: number;
-    callbackUrl: string;
-  };
-  oauth: {
-    clientId: string;
-    scope: string[];
-  };
-  features: {
-    apiAccess: boolean;
-    metricsEnabled: boolean;
-    realTimeUpdates: boolean;
-  };
-}
-
-// Default configuration values
-const DEFAULT_OBP_BASE_URL = "http://127.0.0.1:9000";
-const DEFAULT_APP_PORT = 3003;
-
-// Parse URL to extract host and port information
-function parseUrlInfo(url: string) {
-  try {
-    const parsedUrl = new URL(url);
-    return {
-      host: parsedUrl.hostname,
-      port: parsedUrl.port
-        ? parseInt(parsedUrl.port)
-        : parsedUrl.protocol === "https:"
-          ? 443
-          : 80,
-      protocol: parsedUrl.protocol.replace(":", ""),
-    };
-  } catch (error) {
-    // Fallback parsing for cases where URL might be malformed
-    const match = url.match(/^(https?):\/\/([^:\/]+)(?::(\d+))?/);
-    if (match) {
-      return {
-        host: match[2],
-        port: match[3] ? parseInt(match[3]) : match[1] === "https" ? 443 : 80,
-        protocol: match[1],
-      };
-    }
-    return {
-      host: "localhost",
-      port: 9000,
-      protocol: "http",
-    };
-  }
-}
-
-// Get configuration from environment variables
-function getConfiguration(): AppConfiguration {
-  const obpBaseUrl = env.PUBLIC_OBP_BASE_URL || DEFAULT_OBP_BASE_URL;
-  const obpInfo = parseUrlInfo(obpBaseUrl);
-
-  // Construct URLs based on base URL
-  const apiUrl = `${obpBaseUrl}/obp/v6.0.0`;
-  const oidcUrl = `${obpBaseUrl}/obp-oidc`;
-
-  // App configuration - use safe defaults on client side
-  const appPort = browser
-    ? DEFAULT_APP_PORT
-    : process.env.PORT
-      ? parseInt(process.env.PORT)
-      : DEFAULT_APP_PORT;
-  const appBaseUrl = `http://localhost:${appPort}`;
-  const callbackUrl = browser
-    ? `${appBaseUrl}/login/obp/callback`
-    : process.env.APP_CALLBACK_URL || `${appBaseUrl}/login/obp/callback`;
-
-  return {
-    obp: {
-      baseUrl: obpBaseUrl,
-      apiUrl: apiUrl,
-      oidcUrl: oidcUrl,
-      host: obpInfo.host,
-      port: obpInfo.port,
-    },
-    app: {
-      baseUrl: appBaseUrl,
-      port: appPort,
-      callbackUrl: callbackUrl,
-    },
-    oauth: {
-      clientId: browser
-        ? "39fb9d38-cd0e-44e7-9da5-556d0673e40d"
-        : process.env.OBP_OAUTH_CLIENT_ID ||
-          "39fb9d38-cd0e-44e7-9da5-556d0673e40d",
-      scope: ["openid", "profile", "email"],
-    },
-    features: {
-      apiAccess: true, // Will be determined at runtime
-      metricsEnabled: true,
-      realTimeUpdates: true,
-    },
-  };
-}
-
-// Export the configuration
-export const config = getConfiguration();
-
-// Helper functions for common configuration needs
-export const configHelpers = {
-  // Get OBP connection status info
-  getObpConnectionInfo() {
-    return {
-      host: config.obp.host,
-      port: config.obp.port,
-      baseUrl: config.obp.baseUrl,
-      apiUrl: config.obp.apiUrl,
-      oidcUrl: config.obp.oidcUrl,
-      displayName: `${config.obp.host}:${config.obp.port}`,
-    };
-  },
-
-  // Get app connection info
-  getAppConnectionInfo() {
-    return {
-      port: config.app.port,
-      baseUrl: config.app.baseUrl,
-      callbackUrl: config.app.callbackUrl,
-    };
-  },
-
-  // Check if URLs are using secure protocols
-  isSecure() {
-    return {
-      obp: config.obp.baseUrl.startsWith("https://"),
-      app: config.app.baseUrl.startsWith("https://"),
-    };
-  },
-
-  // Get environment summary
-  getEnvironmentSummary() {
-    const obpInfo = this.getObpConnectionInfo();
-    const appInfo = this.getAppConnectionInfo();
-    const security = this.isSecure();
-
-    return {
-      environment: "development", // Could be enhanced to detect actual environment
-      obp: {
-        ...obpInfo,
-        secure: security.obp,
-        status: "unknown", // Will be determined at runtime
-      },
-      app: {
-        ...appInfo,
-        secure: security.app,
-      },
-      features: config.features,
-    };
-  },
-
-  // Format configuration for display
-  formatForDisplay() {
-    const summary = this.getEnvironmentSummary();
-
-    return {
-      "OBP Server": {
-        Host: summary.obp.displayName,
-        "Base URL": summary.obp.baseUrl,
-        "API URL": summary.obp.apiUrl,
-        "OIDC URL": summary.obp.oidcUrl,
-        Secure: summary.obp.secure ? "Yes" : "No",
-      },
-      Application: {
-        Port: summary.app.port.toString(),
-        "Base URL": summary.app.baseUrl,
-        "Callback URL": summary.app.callbackUrl,
-        Secure: summary.app.secure ? "Yes" : "No",
-      },
-      OAuth: {
-        "Client ID": config.oauth.clientId,
-        Scopes: config.oauth.scope.join(", "),
-      },
-      Features: {
-        "API Access": config.features.apiAccess ? "Enabled" : "Disabled",
-        Metrics: config.features.metricsEnabled ? "Enabled" : "Disabled",
-        "Real-time Updates": config.features.realTimeUpdates
-          ? "Enabled"
-          : "Disabled",
-      },
-    };
-  },
-};
-
-// Export types for external use
-export type { AppConfiguration };
-
-// Constants for common use
-export const OBP_HOST = config.obp.host;
-export const OBP_PORT = config.obp.port;
-export const OBP_BASE_URL = config.obp.baseUrl;
-export const OBP_API_URL = config.obp.apiUrl;
-export const APP_PORT = config.app.port;
-export const APP_BASE_URL = config.app.baseUrl;
diff --git a/src/lib/oauth/client.ts b/src/lib/oauth/client.ts
index 3c7455d..afc3f1d 100644
--- a/src/lib/oauth/client.ts
+++ b/src/lib/oauth/client.ts
@@ -9,11 +9,24 @@ import { jwtDecode } from "jwt-decode";
 
 export class OAuth2ClientWithConfig extends OAuth2Client {
   OIDCConfig?: OpenIdConnectConfiguration;
+  private readonly storedClientId: string;
+  private readonly storedClientSecret: string;
+  private readonly storedRedirectURI: string;
+  private readonly providerType: string;
 
-  constructor(clientId: string, clientSecret: string, redirectUri: string) {
+  constructor(
+    clientId: string,
+    clientSecret: string,
+    redirectUri: string,
+    providerType: string = "default",
+  ) {
     super(clientId, clientSecret, redirectUri);
 
-    // get the OIDC configuration from the well-known URL if provided
+    // Store credentials for our custom methods to access private properties
+    this.storedClientId = clientId;
+    this.storedClientSecret = clientSecret;
+    this.storedRedirectURI = redirectUri;
+    this.providerType = providerType;
   }
 
   async initOIDCConfig(OIDCConfigUrl: string): Promise<void> {
@@ -32,7 +45,7 @@ export class OAuth2ClientWithConfig extends OAuth2Client {
         return;
       }
       config = await response.json();
-      logger.debug("OIDC config fetched successfully");
+      logger.debug("Raw OIDC config received:", JSON.stringify(config, null, 2));
     } catch (error) {
       throw new Error(`Error fetching OIDC config: ${error}`);
     }
@@ -89,16 +102,26 @@ export class OAuth2ClientWithConfig extends OAuth2Client {
     code: string,
     codeVerifier: string | null,
   ): Promise<any> {
-    logger.debug("Validating authorization code with explicit client_id");
+    // Use a unified modern flow for all providers with built-in fallback
+    // This ensures consistent behavior across providers (Keycloak and OBP-OIDC)
+    return this.validateAuthorizationCodeModern(tokenEndpoint, code, codeVerifier);
+  }
+
+  private async validateAuthorizationCodeLegacy(
+    tokenEndpoint: string,
+    code: string,
+    codeVerifier: string | null,
+  ): Promise<any> {
+    logger.debug("Validating authorization code with legacy method (OBP-OIDC)");
 
     const body = new URLSearchParams();
     body.set("grant_type", "authorization_code");
     body.set("code", code);
-    body.set("redirect_uri", this.redirectURI);
-    body.set("client_id", this.clientId);
+    body.set("redirect_uri", this.storedRedirectURI);
+    body.set("client_id", this.storedClientId);
 
-    if (this.clientSecret) {
-      body.set("client_secret", this.clientSecret);
+    if (this.storedClientSecret) {
+      body.set("client_secret", this.storedClientSecret);
     }
 
     if (codeVerifier) {
@@ -139,4 +162,119 @@ export class OAuth2ClientWithConfig extends OAuth2Client {
           : null,
     };
   }
+
+  private async validateAuthorizationCodeModern(
+    tokenEndpoint: string,
+    code: string,
+    codeVerifier: string | null,
+  ): Promise<any> {
+    logger.debug("Validating authorization code with modern method (KeyCloak)");
+
+    const body = new URLSearchParams();
+    body.set("grant_type", "authorization_code");
+    body.set("code", code);
+    body.set("redirect_uri", this.storedRedirectURI);
+
+    // Prepare headers
+    const headers: Record<string, string> = {
+      "Content-Type": "application/x-www-form-urlencoded",
+      Accept: "application/json",
+    };
+
+    // Use HTTP Basic Authentication for client credentials (RFC 6749 Section 2.3.1)
+    if (this.storedClientSecret) {
+      const credentials = Buffer.from(
+        `${this.storedClientId}:${this.storedClientSecret}`,
+      ).toString("base64");
+      headers["Authorization"] = `Basic ${credentials}`;
+      logger.debug("Using Basic Authentication for client credentials");
+    } else {
+      // Public client - include client_id in body
+      body.set("client_id", this.storedClientId);
+      logger.debug("Using client_id in request body (public client)");
+    }
+
+    if (codeVerifier) {
+      body.set("code_verifier", codeVerifier);
+    }
+
+    logger.debug(`Token request body: ${body.toString()}`);
+
+    const response = await fetch(tokenEndpoint, {
+      method: "POST",
+      headers,
+      body: body.toString(),
+    });
+
+    if (!response.ok) {
+      const errorData = await response.json().catch(() => ({}));
+      logger.error(
+        `Token endpoint error - Status: ${response.status}, Data:`,
+        errorData,
+      );
+
+      // If Basic Auth failed and we have a client secret, try with credentials in body as fallback
+      if (
+        response.status === 401 &&
+        this.storedClientSecret &&
+        !body.has("client_id")
+      ) {
+        logger.warn(
+          "Basic Auth failed, retrying with credentials in request body",
+        );
+
+        // Add client credentials to body for retry
+        body.set("client_id", this.storedClientId);
+        body.set("client_secret", this.storedClientSecret);
+
+        // Remove Authorization header
+        delete headers["Authorization"];
+
+        const retryResponse = await fetch(tokenEndpoint, {
+          method: "POST",
+          headers,
+          body: body.toString(),
+        });
+
+        if (!retryResponse.ok) {
+          const retryErrorData = await retryResponse.json().catch(() => ({}));
+          logger.error(
+            `Token endpoint retry error - Status: ${retryResponse.status}, Data:`,
+            retryErrorData,
+          );
+          throw new Error(
+            `Token request failed after retry: ${retryResponse.status} ${retryResponse.statusText}`,
+          );
+        }
+
+        const retryTokens = await retryResponse.json();
+        logger.debug("Token response received successfully after retry");
+
+        return {
+          accessToken: () => retryTokens.access_token,
+          refreshToken: () => retryTokens.refresh_token,
+          accessTokenExpiresAt: () =>
+            retryTokens.expires_in
+              ? new Date(Date.now() + retryTokens.expires_in * 1000)
+              : null,
+        };
+      }
+
+      throw new Error(
+        `Token request failed: ${response.status} ${response.statusToken}`,
+      );
+    }
+
+    const tokens = await response.json();
+    logger.debug("Token response received successfully");
+
+    return {
+      accessToken: () => tokens.access_token,
+      refreshToken: () => tokens.refresh_token,
+      accessTokenExpiresAt: () =>
+        tokens.expires_in
+          ? new Date(Date.now() + tokens.expires_in * 1000)
+          : null,
+    };
+  }
 }
diff --git a/src/routes/(protected)/aggregate-metrics/+page.svelte b/src/routes/(protected)/aggregate-metrics/+page.svelte
index 67b7316..e8cf40e 100644
--- a/src/routes/(protected)/aggregate-metrics/+page.svelte
+++ b/src/routes/(protected)/aggregate-metrics/+page.svelte
@@ -2,7 +2,7 @@
   import { goto } from "$app/navigation";
   import { invalidate } from "$app/navigation";
   import type { PageData } from "./$types";
-  import { configHelpers } from "$lib/config";
+  import { env } from "$env/dynamic/public";
   import MetricsQueryForm from "$lib/components/metrics/MetricsQueryForm.svelte";
 
   let { data } = $props<{ data: PageData }>();
@@ -44,7 +44,20 @@
   let lastCorrelationId = $state<string>("N/A");
 
   // Configuration information
-  let obpInfo = $derived(configHelpers.getObpConnectionInfo());
+  const obpBaseUrl = env.PUBLIC_OBP_BASE_URL || "http://127.0.0.1:8080";
+  const obpApiUrl = `${obpBaseUrl}/obp/v6.0.0`;
+  const obpOidcUrl = `${obpBaseUrl}/obp-oidc`;
+  
+  function getDisplayName(url: string): string {
+    try {
+      const parsed = new URL(url);
+      return `${parsed.hostname}:${parsed.port || (parsed.protocol === 'https:' ? '443' : '80')}`;
+    } catch {
+      return url;
+    }
+  }
+  
+  const obpDisplayName = getDisplayName(obpBaseUrl);
 
   // Helper function to convert datetime-local format to OBP API format
   function formatDateForAPI(dateString: string): string {
@@ -452,7 +465,7 @@
       />
       <div style="margin-top: 1rem; font-size: 0.7rem; line-height: 1.4;">
         <strong>URL:</strong>
-        {obpInfo.baseUrl}/obp/v6.0.0/management/aggregate-metrics?{decodeURIComponent(
+        {obpBaseUrl}/obp/v6.0.0/management/aggregate-metrics?{decodeURIComponent(
           currentQueryString,
         )}
       </div>
@@ -493,7 +506,7 @@
           Showing {metricsHistory.length} aggregate metric{metricsHistory.length ===
           1
             ? ""
-            : "s"} from {obpInfo.displayName}
+            : "s"} from {obpDisplayName}
         </div>
         <div class="table-wrapper">
           <table class="metrics-table">
@@ -601,7 +614,7 @@
             No Aggregate Metrics Found
           </h4>
           <p style="text-align: center; margin-bottom: 1.5rem;">
-            No aggregate metrics found for <strong>{obpInfo.displayName}</strong
+            No aggregate metrics found for <strong>{obpDisplayName}</strong
             >.
           </p>
           <div
@@ -615,9 +628,9 @@
             <div
               style="font-family: monospace; font-size: 0.75rem; color: #4a5568;"
             >
-              <div>• Base URL: {obpInfo.baseUrl}</div>
-              <div>• API URL: {obpInfo.apiUrl}</div>
-              <div>• OIDC URL: {obpInfo.oidcUrl}</div>
+              <div>• Base URL: {obpBaseUrl}</div>
+              <div>• API URL: {obpApiUrl}</div>
+              <div>• OIDC URL: {obpOidcUrl}</div>
             </div>
           </div>
           <button
@@ -642,7 +655,7 @@
           </h4>
           <p style="text-align: center; margin-bottom: 1rem;">
             Cannot connect to OBP server at <strong
-              >{obpInfo.displayName}</strong
+              >{obpDisplayName}</strong
             >
           </p>
           <p style="text-align: center; font-size: 0.875rem; color: #718096;">
diff --git a/src/routes/(protected)/dynamic-entities/system/openapi-json/+page.server.ts b/src/routes/(protected)/dynamic-entities/system/openapi-json/+page.server.ts
index 6e1070a..3e4a152 100644
--- a/src/routes/(protected)/dynamic-entities/system/openapi-json/+page.server.ts
+++ b/src/routes/(protected)/dynamic-entities/system/openapi-json/+page.server.ts
@@ -2,7 +2,7 @@ import type { PageServerLoad } from "./$types";
 import { error } from "@sveltejs/kit";
 import { createLogger } from "$lib/utils/logger";
 import { SessionOAuthHelper } from "$lib/oauth/sessionHelper";
-import { OBP_API_URL } from "$lib/config";
+import { env } from "$env/dynamic/public";
 
 const logger = createLogger("OpenAPIJSONPageServer");
 
@@ -25,7 +25,7 @@ export const load: PageServerLoad = async ({ locals, url }) => {
 
   try {
     logger.info("=== FETCHING DYNAMIC ENTITY OPENAPI JSON ===");
-    let apiUrl = `${OBP_API_URL}/resource-docs/OBPv6.0.0/openapi?content=dynamic`;
+    let apiUrl = `${env.PUBLIC_OBP_BASE_URL}/obp/v6.0.0/resource-docs/OBPv6.0.0/openapi?content=dynamic`;
     if (tags) {
       apiUrl += `&tags=${encodeURIComponent(tags)}`;
       logger.info(`Filtering by tags: ${tags}`);
diff --git a/src/routes/(protected)/dynamic-entities/system/openapi-yaml/+page.server.ts b/src/routes/(protected)/dynamic-entities/system/openapi-yaml/+page.server.ts
index 24838a9..d94cd04 100644
--- a/src/routes/(protected)/dynamic-entities/system/openapi-yaml/+page.server.ts
+++ b/src/routes/(protected)/dynamic-entities/system/openapi-yaml/+page.server.ts
@@ -2,7 +2,7 @@ import type { PageServerLoad } from "./$types";
 import { error } from "@sveltejs/kit";
 import { createLogger } from "$lib/utils/logger";
 import { SessionOAuthHelper } from "$lib/oauth/sessionHelper";
-import { OBP_API_URL } from "$lib/config";
+import { env } from "$env/dynamic/public";
 
 const logger = createLogger("OpenAPIYAMLPageServer");
 
@@ -25,7 +25,7 @@ export const load: PageServerLoad = async ({ locals, url }) => {
 
   try {
     logger.info("=== FETCHING DYNAMIC ENTITY OPENAPI YAML ===");
-    let apiUrl = `${OBP_API_URL}/resource-docs/OBPv6.0.0/openapi.yaml?content=dynamic`;
+    let apiUrl = `${env.PUBLIC_OBP_BASE_URL}/obp/v6.0.0/resource-docs/OBPv6.0.0/openapi.yaml?content=dynamic`;
     if (tags) {
       apiUrl += `&tags=${encodeURIComponent(tags)}`;
       logger.info(`Filtering by tags: ${tags}`);
diff --git a/src/routes/(protected)/metrics/+page.svelte b/src/routes/(protected)/metrics/+page.svelte
index cfda619..f3a8d4b 100644
--- a/src/routes/(protected)/metrics/+page.svelte
+++ b/src/routes/(protected)/metrics/+page.svelte
@@ -2,7 +2,7 @@
   import { goto } from "$app/navigation";
   import { invalidate } from "$app/navigation";
   import type { PageData } from "./$types";
-  import { configHelpers } from "$lib/config";
+  import { env } from "$env/dynamic/public";
   import MetricsQueryForm from "$lib/components/metrics/MetricsQueryForm.svelte";
 
   let { data } = $props<{ data: PageData }>();
@@ -44,7 +44,20 @@
   let timestampColorIndex = $state(0);
 
   // Configuration information
-  let obpInfo = $derived(configHelpers.getObpConnectionInfo());
+  const obpBaseUrl = env.PUBLIC_OBP_BASE_URL || "http://127.0.0.1:8080";
+  const obpApiUrl = `${obpBaseUrl}/obp/v6.0.0`;
+  const obpOidcUrl = `${obpBaseUrl}/obp-oidc`;
+  
+  function getDisplayName(url: string): string {
+    try {
+      const parsed = new URL(url);
+      return `${parsed.hostname}:${parsed.port || (parsed.protocol === 'https:' ? '443' : '80')}`;
+    } catch {
+      return url;
+    }
+  }
+  
+  const obpDisplayName = getDisplayName(obpBaseUrl);
 
   // Helper function to convert datetime-local format to OBP API format
   function formatDateForAPI(dateString: string): string {
@@ -383,7 +396,7 @@
     <div class="panel-header">
       <h2 class="panel-title">API Metrics Results</h2>
       <div class="panel-subtitle">
-        URL: {obpInfo.baseUrl}/obp/v6.0.0/management/metrics?{currentQueryString}
+        URL: {obpBaseUrl}/obp/v6.0.0/management/metrics?{currentQueryString}
         <br />
         Last updated:
         <span class="timestamp-color-{timestampColorIndex}"
@@ -408,7 +421,7 @@
     <div class="panel-content">
       {#if metrics?.metrics && metrics.metrics.length > 0}
         <div class="metrics-summary">
-          Showing {metrics.count} API calls from {obpInfo.displayName}
+          Showing {metrics.count} API calls from {obpDisplayName}
         </div>
         <div class="table-wrapper">
           {#key data.lastUpdated}
@@ -478,7 +491,7 @@
         </div>
         <div class="metrics-summary">
           Showing {metrics.count} API calls from
-          {obpInfo.displayName}
+          {obpDisplayName}
         </div>
       {:else if hasApiAccess}
         <div class="empty-state">
@@ -494,7 +507,7 @@
           </h4>
           <p style="text-align: center; margin-bottom: 1.5rem;">
             No recent API requests found for <strong
-              >{obpInfo.displayName}</strong
+              >{obpDisplayName}</strong
             >.
           </p>
           <div
@@ -508,9 +521,9 @@
             <div
               style="font-family: monospace; font-size: 0.75rem; color: #4a5568;"
             >
-              <div>• Base URL: {obpInfo.baseUrl}</div>
-              <div>• API URL: {obpInfo.apiUrl}</div>
-              <div>• OIDC URL: {obpInfo.oidcUrl}</div>
+              <div>• Base URL: {obpBaseUrl}</div>
+              <div>• API URL: {obpApiUrl}</div>
+              <div>• OIDC URL: {obpOidcUrl}</div>
             </div>
           </div>
           <button
@@ -535,7 +548,7 @@
           </h4>
           <p style="text-align: center; margin-bottom: 1rem;">
             Cannot connect to OBP server at <strong
-              >{obpInfo.displayName}</strong
+              >{obpDisplayName}</strong
             >
           </p>
           <p style="text-align: center; font-size: 0.875rem; color: #718096;">
diff --git a/src/routes/login/[provider]/callback/+server.ts b/src/routes/login/[provider]/callback/+server.ts
index 43b23bd..9f90b90 100644
--- a/src/routes/login/[provider]/callback/+server.ts
+++ b/src/routes/login/[provider]/callback/+server.ts
@@ -5,7 +5,6 @@ import type { OAuth2Tokens } from "arctic";
 import type { RequestEvent } from "@sveltejs/kit";
 import { error } from "@sveltejs/kit";
 import { env } from "$env/dynamic/public";
-import { OBP_API_URL } from "$lib/config";
 
 export async function GET(event: RequestEvent): Promise<Response> {
   const { provider: urlProvider } = event.params;
diff --git a/src/routes/login/obp/callback/+server.ts b/src/routes/login/obp/callback/+server.ts
index f526e03..fff88e4 100644
--- a/src/routes/login/obp/callback/+server.ts
+++ b/src/routes/login/obp/callback/+server.ts
@@ -5,7 +5,6 @@ import type { OAuth2Tokens } from "arctic";
 import type { RequestEvent } from "@sveltejs/kit";
 import { error } from "@sveltejs/kit";
 import { env } from "$env/dynamic/public";
-import { OBP_API_URL } from "$lib/config";
 
 export async function GET(event: RequestEvent): Promise<Response> {
   // Check for OAuth error responses first (e.g., invalid credentials)
@@ -176,8 +175,7 @@ export async function GET(event: RequestEvent): Promise<Response> {
 
   const obpAccessToken = tokens.accessToken();
 
-  logger.debug(`OBP_API_URL from config: ${OBP_API_URL}`);
-  const currentUserUrl = `${OBP_API_URL}/users/current`;
+  const currentUserUrl = `${env.PUBLIC_OBP_BASE_URL}/obp/v6.0.0/users/current`;
   logger.info("Fetching current user from OBP:", currentUserUrl);
   const currentUserRequest = new Request(currentUserUrl);