diff --git a/composer.json b/composer.json
index 6e4f37cd..43a28a6c 100644
--- a/composer.json
+++ b/composer.json
@@ -5,12 +5,12 @@
 		]
 	},
 	"require": {
-		"unl/php-wdn-templates": "^5.3",
-		"saltybeagle/savvy": "0.8.1",
+		"unl/php-wdn-templates": "^6.0", 
+		"unl/savvy": "^1.0",
 		"jasig/phpcas": "1.3.x-dev",
 		"ramsey/uuid": "^3.5",
 		"theiconic/php-ga-measurement-protocol": "^2.3",
-		"endroid/qr-code": "^4.5"
+		"endroid/qr-code": "5.1.0"
 	},
 	"require-dev": {
 		"phpstan/phpstan": "^0.12.46"
diff --git a/composer.lock b/composer.lock
index c24c98e4..dbf6a00a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,32 +4,33 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "af2940b11034cf40aa90bdc6fb32561e",
+    "content-hash": "2f0e0cf24342b14b9ba413a94f23f486",
     "packages": [
         {
             "name": "bacon/bacon-qr-code",
-            "version": "2.0.7",
+            "version": "v3.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Bacon/BaconQrCode.git",
-                "reference": "d70c840f68657ce49094b8d91f9ee0cc07fbf66c"
+                "reference": "4da2233e72eeecd9be3b62e0dc2cc9ed8e2e31c2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/d70c840f68657ce49094b8d91f9ee0cc07fbf66c",
-                "reference": "d70c840f68657ce49094b8d91f9ee0cc07fbf66c",
+                "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/4da2233e72eeecd9be3b62e0dc2cc9ed8e2e31c2",
+                "reference": "4da2233e72eeecd9be3b62e0dc2cc9ed8e2e31c2",
                 "shasum": ""
             },
             "require": {
                 "dasprid/enum": "^1.0.3",
                 "ext-iconv": "*",
-                "php": "^7.1 || ^8.0"
+                "php": "^8.1"
             },
             "require-dev": {
-                "phly/keep-a-changelog": "^2.1",
-                "phpunit/phpunit": "^7 | ^8 | ^9",
-                "spatie/phpunit-snapshot-assertions": "^4.2.9",
-                "squizlabs/php_codesniffer": "^3.4"
+                "phly/keep-a-changelog": "^2.12",
+                "phpunit/phpunit": "^10.5.11 || ^11.0.4",
+                "spatie/phpunit-snapshot-assertions": "^5.1.5",
+                "spatie/pixelmatch-php": "^1.2.0",
+                "squizlabs/php_codesniffer": "^3.9"
             },
             "suggest": {
                 "ext-imagick": "to generate QR code images"
@@ -56,27 +57,30 @@
             "homepage": "https://github.com/Bacon/BaconQrCode",
             "support": {
                 "issues": "https://github.com/Bacon/BaconQrCode/issues",
-                "source": "https://github.com/Bacon/BaconQrCode/tree/2.0.7"
+                "source": "https://github.com/Bacon/BaconQrCode/tree/v3.1.1"
             },
-            "time": "2022-03-14T02:02:36+00:00"
+            "time": "2026-04-05T21:06:35+00:00"
         },
         {
             "name": "dasprid/enum",
-            "version": "1.0.3",
+            "version": "1.0.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/DASPRiD/Enum.git",
-                "reference": "5abf82f213618696dda8e3bf6f64dd042d8542b2"
+                "reference": "b5874fa9ed0043116c72162ec7f4fb50e02e7cce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/5abf82f213618696dda8e3bf6f64dd042d8542b2",
-                "reference": "5abf82f213618696dda8e3bf6f64dd042d8542b2",
+                "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/b5874fa9ed0043116c72162ec7f4fb50e02e7cce",
+                "reference": "b5874fa9ed0043116c72162ec7f4fb50e02e7cce",
                 "shasum": ""
             },
+            "require": {
+                "php": ">=7.1 <9.0"
+            },
             "require-dev": {
-                "phpunit/phpunit": "^7 | ^8 | ^9",
-                "squizlabs/php_codesniffer": "^3.4"
+                "phpunit/phpunit": "^7 || ^8 || ^9 || ^10 || ^11",
+                "squizlabs/php_codesniffer": "*"
             },
             "type": "library",
             "autoload": {
@@ -103,32 +107,32 @@
             ],
             "support": {
                 "issues": "https://github.com/DASPRiD/Enum/issues",
-                "source": "https://github.com/DASPRiD/Enum/tree/1.0.3"
+                "source": "https://github.com/DASPRiD/Enum/tree/1.0.7"
             },
-            "time": "2020-10-02T16:03:48+00:00"
+            "time": "2025-09-16T12:23:56+00:00"
         },
         {
             "name": "endroid/qr-code",
-            "version": "4.6.1",
+            "version": "5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/endroid/qr-code.git",
-                "reference": "a75c913b0e4d6ad275e49a2c1de1cacffc6c2184"
+                "reference": "393fec6c4cbdc1bd65570ac9d245704428010122"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/endroid/qr-code/zipball/a75c913b0e4d6ad275e49a2c1de1cacffc6c2184",
-                "reference": "a75c913b0e4d6ad275e49a2c1de1cacffc6c2184",
+                "url": "https://api.github.com/repos/endroid/qr-code/zipball/393fec6c4cbdc1bd65570ac9d245704428010122",
+                "reference": "393fec6c4cbdc1bd65570ac9d245704428010122",
                 "shasum": ""
             },
             "require": {
-                "bacon/bacon-qr-code": "^2.0.5",
-                "php": "^7.4||^8.0"
+                "bacon/bacon-qr-code": "^3.0",
+                "php": "^8.1"
             },
             "require-dev": {
-                "endroid/quality": "dev-master",
+                "endroid/quality": "dev-main",
                 "ext-gd": "*",
-                "khanamiryan/qrcode-detector-decoder": "^1.0.4",
+                "khanamiryan/qrcode-detector-decoder": "^2.0.2",
                 "setasign/fpdf": "^1.8.2"
             },
             "suggest": {
@@ -140,7 +144,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.x-dev"
+                    "dev-main": "5.x-dev"
                 }
             },
             "autoload": {
@@ -169,7 +173,7 @@
             ],
             "support": {
                 "issues": "https://github.com/endroid/qr-code/issues",
-                "source": "https://github.com/endroid/qr-code/tree/4.6.1"
+                "source": "https://github.com/endroid/qr-code/tree/5.1.0"
             },
             "funding": [
                 {
@@ -177,26 +181,26 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-10-26T08:48:17+00:00"
+            "time": "2024-09-08T08:52:55+00:00"
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "7.5.0",
+            "version": "7.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba"
+                "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba",
-                "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b51ac707cfa420b7bfd4e4d5e510ba8008e822b4",
+                "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "guzzlehttp/promises": "^1.5",
-                "guzzlehttp/psr7": "^1.9 || ^2.4",
+                "guzzlehttp/promises": "^2.3",
+                "guzzlehttp/psr7": "^2.8",
                 "php": "^7.2.5 || ^8.0",
                 "psr/http-client": "^1.0",
                 "symfony/deprecation-contracts": "^2.2 || ^3.0"
@@ -205,10 +209,11 @@
                 "psr/http-client-implementation": "1.0"
             },
             "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.8.1",
+                "bamarni/composer-bin-plugin": "^1.8.2",
                 "ext-curl": "*",
-                "php-http/client-integration-tests": "^3.0",
-                "phpunit/phpunit": "^8.5.29 || ^9.5.23",
+                "guzzle/client-integration-tests": "3.0.2",
+                "php-http/message-factory": "^1.1",
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20",
                 "psr/log": "^1.1 || ^2.0 || ^3.0"
             },
             "suggest": {
@@ -221,9 +226,6 @@
                 "bamarni-bin": {
                     "bin-links": true,
                     "forward-command": false
-                },
-                "branch-alias": {
-                    "dev-master": "7.5-dev"
                 }
             },
             "autoload": {
@@ -289,7 +291,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.5.0"
+                "source": "https://github.com/guzzle/guzzle/tree/7.10.0"
             },
             "funding": [
                 {
@@ -305,38 +307,37 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-08-28T15:39:27+00:00"
+            "time": "2025-08-23T22:36:01+00:00"
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "1.5.2",
+            "version": "2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "b94b2807d85443f9719887892882d0329d1e2598"
+                "reference": "481557b130ef3790cf82b713667b43030dc9c957"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598",
-                "reference": "b94b2807d85443f9719887892882d0329d1e2598",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/481557b130ef3790cf82b713667b43030dc9c957",
+                "reference": "481557b130ef3790cf82b713667b43030dc9c957",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5"
+                "php": "^7.2.5 || ^8.0"
             },
             "require-dev": {
-                "symfony/phpunit-bridge": "^4.4 || ^5.1"
+                "bamarni/composer-bin-plugin": "^1.8.2",
+                "phpunit/phpunit": "^8.5.44 || ^9.6.25"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "1.5-dev"
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
                 }
             },
             "autoload": {
-                "files": [
-                    "src/functions_include.php"
-                ],
                 "psr-4": {
                     "GuzzleHttp\\Promise\\": "src/"
                 }
@@ -373,7 +374,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/1.5.2"
+                "source": "https://github.com/guzzle/promises/tree/2.3.0"
             },
             "funding": [
                 {
@@ -389,26 +390,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-08-28T14:55:35+00:00"
+            "time": "2025-08-22T14:34:08+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.4.3",
+            "version": "2.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "67c26b443f348a51926030c83481b85718457d3d"
+                "reference": "7d0ed42f28e42d61352a7a79de682e5e67fec884"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/67c26b443f348a51926030c83481b85718457d3d",
-                "reference": "67c26b443f348a51926030c83481b85718457d3d",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/7d0ed42f28e42d61352a7a79de682e5e67fec884",
+                "reference": "7d0ed42f28e42d61352a7a79de682e5e67fec884",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2.5 || ^8.0",
                 "psr/http-factory": "^1.0",
-                "psr/http-message": "^1.0",
+                "psr/http-message": "^1.1 || ^2.0",
                 "ralouphie/getallheaders": "^3.0"
             },
             "provide": {
@@ -416,9 +417,10 @@
                 "psr/http-message-implementation": "1.0"
             },
             "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.8.1",
-                "http-interop/http-factory-tests": "^0.9",
-                "phpunit/phpunit": "^8.5.29 || ^9.5.23"
+                "bamarni/composer-bin-plugin": "^1.8.2",
+                "http-interop/http-factory-tests": "0.9.0",
+                "jshttp/mime-db": "1.54.0.1",
+                "phpunit/phpunit": "^8.5.44 || ^9.6.25"
             },
             "suggest": {
                 "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
@@ -428,9 +430,6 @@
                 "bamarni-bin": {
                     "bin-links": true,
                     "forward-command": false
-                },
-                "branch-alias": {
-                    "dev-master": "2.4-dev"
                 }
             },
             "autoload": {
@@ -492,7 +491,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.4.3"
+                "source": "https://github.com/guzzle/psr7/tree/2.9.0"
             },
             "funding": [
                 {
@@ -508,7 +507,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-10-26T14:07:24+00:00"
+            "time": "2026-03-10T16:41:02+00:00"
         },
         {
             "name": "jasig/phpcas",
@@ -516,12 +515,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/apereo/phpCAS.git",
-                "reference": "49160bef2c38cd6b9ed2026353a7a044ea58556d"
+                "reference": "9f5d8cc0a1f758fd1975508acbd8fa4dc8de3168"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/apereo/phpCAS/zipball/49160bef2c38cd6b9ed2026353a7a044ea58556d",
-                "reference": "49160bef2c38cd6b9ed2026353a7a044ea58556d",
+                "url": "https://api.github.com/repos/apereo/phpCAS/zipball/9f5d8cc0a1f758fd1975508acbd8fa4dc8de3168",
+                "reference": "9f5d8cc0a1f758fd1975508acbd8fa4dc8de3168",
                 "shasum": ""
             },
             "require": {
@@ -543,6 +542,9 @@
                 }
             },
             "autoload": {
+                "files": [
+                    "source/CAS.php"
+                ],
                 "classmap": [
                     "source/"
                 ]
@@ -577,7 +579,8 @@
                 "issues": "https://github.com/apereo/phpCAS/issues",
                 "source": "https://github.com/apereo/phpCAS/tree/master"
             },
-            "time": "2022-08-16T07:05:09+00:00"
+            "abandoned": "apereo/phpcas",
+            "time": "2026-04-22T09:24:04+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -631,21 +634,21 @@
         },
         {
             "name": "psr/http-client",
-            "version": "1.0.1",
+            "version": "1.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-client.git",
-                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"
+                "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
-                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
+                "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90",
+                "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.0 || ^8.0",
-                "psr/http-message": "^1.0"
+                "psr/http-message": "^1.0 || ^2.0"
             },
             "type": "library",
             "extra": {
@@ -665,7 +668,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for HTTP clients",
@@ -677,27 +680,27 @@
                 "psr-18"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-client/tree/master"
+                "source": "https://github.com/php-fig/http-client"
             },
-            "time": "2020-06-29T06:28:15+00:00"
+            "time": "2023-09-23T14:17:50+00:00"
         },
         {
             "name": "psr/http-factory",
-            "version": "1.0.1",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-factory.git",
-                "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be"
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
-                "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0.0",
-                "psr/http-message": "^1.0"
+                "php": ">=7.1",
+                "psr/http-message": "^1.0 || ^2.0"
             },
             "type": "library",
             "extra": {
@@ -717,10 +720,10 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
-            "description": "Common interfaces for PSR-7 HTTP message factories",
+            "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories",
             "keywords": [
                 "factory",
                 "http",
@@ -732,31 +735,31 @@
                 "response"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-factory/tree/master"
+                "source": "https://github.com/php-fig/http-factory"
             },
-            "time": "2019-04-30T12:38:16+00:00"
+            "time": "2024-04-15T12:06:14+00:00"
         },
         {
             "name": "psr/http-message",
-            "version": "1.0.1",
+            "version": "2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-message.git",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
@@ -771,7 +774,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for HTTP messages",
@@ -785,22 +788,22 @@
                 "response"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-message/tree/master"
+                "source": "https://github.com/php-fig/http-message/tree/2.0"
             },
-            "time": "2016-08-06T14:39:51+00:00"
+            "time": "2023-04-04T09:54:51+00:00"
         },
         {
             "name": "psr/log",
-            "version": "3.0.0",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001"
+                "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001",
-                "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
+                "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
                 "shasum": ""
             },
             "require": {
@@ -835,9 +838,9 @@
                 "psr-3"
             ],
             "support": {
-                "source": "https://github.com/php-fig/log/tree/3.0.0"
+                "source": "https://github.com/php-fig/log/tree/3.0.2"
             },
-            "time": "2021-07-14T16:46:02+00:00"
+            "time": "2024-09-11T13:17:53+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
@@ -885,16 +888,16 @@
         },
         {
             "name": "ramsey/uuid",
-            "version": "3.9.6",
+            "version": "3.9.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/uuid.git",
-                "reference": "ffa80ab953edd85d5b6c004f96181a538aad35a3"
+                "reference": "dc75aa439eb4c1b77f5379fd958b3dc0e6014178"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/ffa80ab953edd85d5b6c004f96181a538aad35a3",
-                "reference": "ffa80ab953edd85d5b6c004f96181a538aad35a3",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/dc75aa439eb4c1b77f5379fd958b3dc0e6014178",
+                "reference": "dc75aa439eb4c1b77f5379fd958b3dc0e6014178",
                 "shasum": ""
             },
             "require": {
@@ -931,11 +934,6 @@
                 "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type."
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.x-dev"
-                }
-            },
             "autoload": {
                 "files": [
                     "src/functions.php"
@@ -986,48 +984,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-25T23:07:42+00:00"
-        },
-        {
-            "name": "saltybeagle/savvy",
-            "version": "v0.8.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/saltybeagle/Savvy.git",
-                "reference": "d07ffa39fa850cf702f73cd9d7106cfbca20741c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/saltybeagle/Savvy/zipball/d07ffa39fa850cf702f73cd9d7106cfbca20741c",
-                "reference": "d07ffa39fa850cf702f73cd9d7106cfbca20741c",
-                "shasum": ""
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Savvy": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "description": "Savvy is a powerful but lightweight object-oriented template system for PHP.",
-            "support": {
-                "issues": "https://github.com/saltybeagle/Savvy/issues",
-                "source": "https://github.com/saltybeagle/Savvy/tree/v0.8.1"
-            },
-            "time": "2014-10-08T16:24:53+00:00"
+            "time": "2022-12-19T21:55:10+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.1.1",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "07f1b9cc2ffee6aaafcf4b710fbc38ff736bd918"
+                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/07f1b9cc2ffee6aaafcf4b710fbc38ff736bd918",
-                "reference": "07f1b9cc2ffee6aaafcf4b710fbc38ff736bd918",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62",
+                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62",
                 "shasum": ""
             },
             "require": {
@@ -1035,12 +1005,12 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "3.1-dev"
-                },
                 "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
+                "branch-alias": {
+                    "dev-main": "3.6-dev"
                 }
             },
             "autoload": {
@@ -1065,7 +1035,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.1.1"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -1081,24 +1051,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-25T11:15:52+00:00"
+            "time": "2024-09-25T14:21:43+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.26.0",
+            "version": "v1.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4"
+                "reference": "141046a8f9477948ff284fa65be2095baafb94f2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4",
-                "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/141046a8f9477948ff284fa65be2095baafb94f2",
+                "reference": "141046a8f9477948ff284fa65be2095baafb94f2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-ctype": "*"
@@ -1108,12 +1078,9 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.26-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -1147,7 +1114,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.37.0"
             },
             "funding": [
                 {
@@ -1158,12 +1125,16 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-24T11:49:31+00:00"
+            "time": "2026-04-10T16:19:22+00:00"
         },
         {
             "name": "theiconic/php-ga-measurement-protocol",
@@ -1266,25 +1237,25 @@
         },
         {
             "name": "unl/php-dwt-parser",
-            "version": "v1.0.2",
+            "version": "v1.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/unl/phpdwtparser.git",
-                "reference": "40b75f42a301dadfbf978995cfe535693099b006"
+                "reference": "88d089538d7b529514f3f19cab4afc09bd13082e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/unl/phpdwtparser/zipball/40b75f42a301dadfbf978995cfe535693099b006",
-                "reference": "40b75f42a301dadfbf978995cfe535693099b006",
+                "url": "https://api.github.com/repos/unl/phpdwtparser/zipball/88d089538d7b529514f3f19cab4afc09bd13082e",
+                "reference": "88d089538d7b529514f3f19cab4afc09bd13082e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5",
+                "php": ">=8.1",
                 "unl/html-minifier": "*",
                 "zendframework/zend-code": "^2.5"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7"
+                "phpunit/phpunit": "^10.5.27"
             },
             "bin": [
                 "bin/createTemplates.php"
@@ -1315,30 +1286,30 @@
             "homepage": "http://wdn.unl.edu/",
             "support": {
                 "issues": "https://github.com/unl/phpdwtparser/issues",
-                "source": "https://github.com/unl/phpdwtparser/tree/v1.0.2"
+                "source": "https://github.com/unl/phpdwtparser/tree/v1.0.3"
             },
-            "time": "2020-07-16T19:05:41+00:00"
+            "time": "2024-07-11T18:45:27+00:00"
         },
         {
             "name": "unl/php-wdn-templates",
-            "version": "v5.3.4",
+            "version": "v6.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/unl/phpunltemplates.git",
-                "reference": "845d8e05a6ae636797b350659f64b5f03b466166"
+                "reference": "ff6cdf9f543f1e9e307bf9b379c65c5fa7f9ac2b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/unl/phpunltemplates/zipball/845d8e05a6ae636797b350659f64b5f03b466166",
-                "reference": "845d8e05a6ae636797b350659f64b5f03b466166",
+                "url": "https://api.github.com/repos/unl/phpunltemplates/zipball/ff6cdf9f543f1e9e307bf9b379c65c5fa7f9ac2b",
+                "reference": "ff6cdf9f543f1e9e307bf9b379c65c5fa7f9ac2b",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5",
-                "unl/php-dwt-parser": "1.0.*"
+                "php": ">=8.1",
+                "unl/php-dwt-parser": "1.0.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "~5.0"
+                "phpunit/phpunit": "^10.5.27"
             },
             "type": "library",
             "autoload": {
@@ -1351,10 +1322,15 @@
                 "BSD-3-Clause"
             ],
             "authors": [
+                {
+                    "name": "Thomas Neumann (tneumann9)",
+                    "email": "tneumann9@unl.edu",
+                    "role": "Developer"
+                },
                 {
                     "name": "Jeff Sturek (jsturek)",
                     "email": "jsturek8@unl.edu",
-                    "role": "Developer"
+                    "role": "Retired Developer"
                 },
                 {
                     "name": "Kevin Abel (kabel)",
@@ -1376,9 +1352,57 @@
             "homepage": "http://wdn.unl.edu/",
             "support": {
                 "issues": "https://github.com/unl/phpunltemplates/issues",
-                "source": "https://github.com/unl/phpunltemplates/tree/v5.3.4"
+                "source": "https://github.com/unl/phpunltemplates/tree/v6.0.0"
+            },
+            "time": "2025-07-22T19:46:24+00:00"
+        },
+        {
+            "name": "unl/savvy",
+            "version": "v1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/unl/Savvy.git",
+                "reference": "853e5b553166c0d6cded5e80a39fff00654ec8c9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/unl/Savvy/zipball/853e5b553166c0d6cded5e80a39fff00654ec8c9",
+                "reference": "853e5b553166c0d6cded5e80a39fff00654ec8c9",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.1"
             },
-            "time": "2022-01-24T19:05:47+00:00"
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Savvy": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Brett Bieber (saltybeagle)",
+                    "email": "saltybeagle@php.net"
+                },
+                {
+                    "name": "Gregory Beaver (cellog)",
+                    "email": "cellog@php.net"
+                },
+                {
+                    "name": "Tommy Neumann (tommyneu)",
+                    "email": "tneumann9@unl.edu"
+                }
+            ],
+            "description": "Savvy is a powerful but lightweight object-oriented template system for PHP.",
+            "homepage": "http://wdn.unl.edu/",
+            "support": {
+                "source": "https://github.com/unl/Savvy/tree/v1.0.0"
+            },
+            "time": "2024-07-11T18:21:33+00:00"
         },
         {
             "name": "zendframework/zend-code",
@@ -1616,16 +1640,16 @@
     "packages-dev": [
         {
             "name": "phpstan/phpstan",
-            "version": "0.12.99",
+            "version": "0.12.100",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "b4d40f1d759942f523be267a1bab6884f46ca3f7"
+                "reference": "48236ddf823547081b2b153d1cd2994b784328c3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b4d40f1d759942f523be267a1bab6884f46ca3f7",
-                "reference": "b4d40f1d759942f523be267a1bab6884f46ca3f7",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/48236ddf823547081b2b153d1cd2994b784328c3",
+                "reference": "48236ddf823547081b2b153d1cd2994b784328c3",
                 "shasum": ""
             },
             "require": {
@@ -1656,7 +1680,7 @@
             "description": "PHPStan - PHP Static Analysis Tool",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/0.12.99"
+                "source": "https://github.com/phpstan/phpstan/tree/0.12.100"
             },
             "funding": [
                 {
@@ -1667,16 +1691,12 @@
                     "url": "https://github.com/phpstan",
                     "type": "github"
                 },
-                {
-                    "url": "https://www.patreon.com/phpstan",
-                    "type": "patreon"
-                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-12T20:09:55+00:00"
+            "time": "2022-11-01T09:52:08+00:00"
         }
     ],
     "aliases": [],
@@ -1686,7 +1706,7 @@
     },
     "prefer-stable": false,
     "prefer-lowest": false,
-    "platform": [],
-    "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "platform": {},
+    "platform-dev": {},
+    "plugin-api-version": "2.6.0"
 }
diff --git a/data/goURL.sql b/data/goURL.sql
index 3cf2755f..3d343b9c 100644
--- a/data/goURL.sql
+++ b/data/goURL.sql
@@ -51,6 +51,15 @@ CREATE TABLE IF NOT EXISTS `tblGroupUsers` (
   PRIMARY KEY (`groupID`, `uid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
+DROP TABLE IF EXISTS `tblAPIKeys`;
+CREATE TABLE IF NOT EXISTS `tblAPIKeys` (
+    `apiKey` CHAR(39) NOT NULL,
+    `uid` VARCHAR(50) NOT NULL,
+
+    PRIMARY KEY (`apiKey`),
+    UNIQUE KEY `unique_uid` (`uid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
 --
 -- Dumping data for table `tblURLs`
 --
diff --git a/src/Themes/dcf/app.tpl.php b/src/Themes/dcf/app.tpl.php
index 9e4d42af..757a4c4a 100644
--- a/src/Themes/dcf/app.tpl.php
+++ b/src/Themes/dcf/app.tpl.php
@@ -112,7 +112,7 @@
 <footer class="dcf-footer" id="dcf-footer" role="contentinfo">
     <div class="dcf-relative">
         <div class="dcf-wrapper dcf-pb-7">
-            <div class="dcf-grid-halves@sm dcf-col-gap-vw dcf-ai-baseline dcf-pt-4 dcf-bt-1 dcf-bt-solid">
+            <div class="dcf-grid-halves@sm dcf-col-gap-vw dcf-ai-baseline dcf-pt-4 dcf-bt-1 dcf-bt-solid"></div>
                 <div>
                     <a class="dcf-institution-title dcf-d-inline-block dcf-txt-xs dcf-txt-decor-hover" href="#">
                         <span class="dcf-uppercase">University</span> <span class="dcf-italic">of</span><span> </span><span class="dcf-uppercase">Nebraska–Lincoln</span>
@@ -175,4 +175,4 @@
 <!-- InstanceBeginEditable name="jsbody" -->
 <!-- InstanceEndEditable -->
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/src/Themes/unl/localfooter.tpl.php b/src/Themes/unl/localfooter.tpl.php
index 18f60e2f..c86252d4 100644
--- a/src/Themes/unl/localfooter.tpl.php
+++ b/src/Themes/unl/localfooter.tpl.php
@@ -1,20 +1,32 @@
-<nav id="dcf-footer-group-1" role="navigation" aria-labelledby="dcf-footer-group-1-heading">
-    <div class="">
-        <h3 class="dcf-txt-md dcf-bold dcf-uppercase dcf-lh-3 unl-ls-2 unl-cream" id="dcf-footer-group-1-heading">About Go URL</h3>
-        <p>Go URL is a URL shortening service similar to <a href="https://bitly.com/" class="external">Bitly</a>. Use this when you would like a shorter URL while retaining the unl.edu domain.</p>
-        <p>
-            This application is a product of the <a href="https://dxg.unl.edu/">Digital Experience Group</a>
-            at <a href="https://www.unl.edu/">Nebraska</a>. DXG is a part
-            of <a href="https://ucomm.unl.edu/">University
-            Communication &amp; Marketing</a>.</p>
-    </div>
-</nav>
-<nav id="dcf-footer-group-2" role="navigation" aria-labelledby="dcf-footer-group-2-heading">
-    <h3 class="dcf-txt-md dcf-bold dcf-uppercase dcf-lh-3 unl-ls-2 unl-cream" id="dcf-footer-group-2-heading">Related Links</h3>
-    <ul class="dcf-list-bare dcf-mb-0">
-        <li><a href="https://wdn.unl.edu/">Web Developer Network</a></li>
-        <li><a href="https://dxg.unl.edu/">Digital Experience Group</a></li>
-        <li><a href="https://ucomm.unl.edu/">University Communication</a></li>
-        <li><a href="https://its.unl.edu/">Information Technology Services</a></li>
+<div class="dcf-footer-group" id="dcf-footer-group-1">
+  <h2 class="dcf-footer-group-heading" id="dcf-footer-group-1-heading">About Go URL</h2>
+    <p class="dcf-txt-sm">
+      Go URL is a URL shortening service similar to 
+      <a href="https://bitly.com/" class="external">Bitly</a>. 
+      Use this when you would like a shorter URL while retaining the unl.edu domain.
+    </p>
+    <p class="dcf-txt-sm">
+        This application is a product of the <a href="https://dxg.unl.edu/">Digital Experience Group</a>
+        at <a href="https://www.unl.edu/">Nebraska</a>. DXG is a part
+        of <a href="https://ucomm.unl.edu/">University
+        Communication &amp; Marketing</a>.
+    </p>
+</div>
+
+<div class="dcf-footer-group" id="dcf-footer-group-2">
+    <h2 class="dcf-footer-group-heading" id="dcf-footer-group-2-heading">Related Links</h2>
+    <ul class="dcf-footer-group-list" aria-labelledby="dcf-footer-group-2-heading" role="list">
+        <li>
+            <a href="https://wdn.unl.edu/">Web Developer Network</a>
+        </li>
+        <li>
+            <a href="https://dxg.unl.edu/">Digital Experience Group</a>
+        </li>
+        <li>
+            <a href="https://ucomm.unl.edu/">University Communication</a>
+        </li>
+        <li>
+            <a href="https://its.unl.edu/">Information Technology Services</a>
+        </li>
     </ul>
-</nav>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/src/goController.php b/src/goController.php
index 4e4403f9..495a10e6 100644
--- a/src/goController.php
+++ b/src/goController.php
@@ -1,11 +1,11 @@
 <?php
 use Endroid\QrCode\Color\Color;
 use Endroid\QrCode\Encoding\Encoding;
-use Endroid\QrCode\ErrorCorrectionLevel\ErrorCorrectionLevelHigh;
+use Endroid\QrCode\ErrorCorrectionLevel;
 use Endroid\QrCode\QrCode;
 use Endroid\QrCode\Label\Label;
 use Endroid\QrCode\Logo\Logo;
-use Endroid\QrCode\RoundBlockSizeMode\RoundBlockSizeModeMargin;
+use Endroid\QrCode\RoundBlockSizeMode;
 use Endroid\QrCode\Writer\PngWriter;
 use Endroid\QrCode\Writer\SvgWriter;
 
@@ -121,6 +121,23 @@ public function dispatch() {
 
         switch($this->route) {
             case self::ROUTE_NAME_API:
+
+            case self::ROUTE_NAME_API_V1_READ:
+                $this->handleRouteRead();
+                die();
+
+            case self::ROUTE_NAME_API_V1_CREATE:
+                $this->handleRouteCreate();
+                die();
+
+            case self::ROUTE_NAME_API_V1_UPDATE:
+                $this->handleRouteUpdate();
+                die();
+
+            case self::ROUTE_NAME_API_V1_DELETE:
+                $this->handleRouteDelete();
+                die();
+
             case self::ROUTE_NAME_HOME:
                 $this->handleRouteHomePage();
                 break;
@@ -186,12 +203,268 @@ public function dispatch() {
                 }
                 break;
 
+            case self::ROUTE_NAME_TOKEN_GENERATOR:
+                $this->handleRouteTokenGenerator();
+                break;
+
+            case self::ROUTE_NAME_NEW_UUID:
+                $this->handleRouteNewUUID();
+                break;
+
             default:
                 $this->handle404();
                 break;
         }
     }
 
+    public function handleRouteRead() {
+        if ($_SERVER['REQUEST_METHOD'] != 'GET') {
+            http_response_code(421);
+            var_dump("Wrong request method. GET required.");
+            die();
+        }
+
+        if (!isset(getallheaders()['X-Api-Key'])) {
+            http_response_code(401);
+            var_dump("No API Key was provided in the headers.");
+            die();
+        }
+
+        $urlID = isset($_GET['urlID']) ? $_GET['urlID'] : null;
+        if(!$this->lilurl->getURL($urlID)) {
+            http_response_code(404);
+            var_dump("URL not found.");
+            die();
+        }
+
+        $info = $this->lilurl->getLinkRow($urlID, NULL, PDO::FETCH_OBJ);
+        $group = $this->lilurl->getGroup($info->groupID);
+
+        header('Content-Type: application/json');
+
+        try {
+            echo json_encode([
+                'success' => true,
+                'message' => 'URL read successfully.',
+                'data' => [
+                    'Go_URL' => $info->urlID,
+                    'Long_URL' => $info->longURL,
+                    'Redirect_Count' => $info->redirects,
+                    'Last_Redirect' => $info->lastRedirect,
+                    'Created_On' => $info->submitDate,
+                    'Created_By' => $info->createdBy,
+                    'Group' => $group ? $group->groupName : null,
+                    'Group_Users' => $group ? array_column($this->lilurl->getGroupUsers($group->groupID), 'uid') : null
+                ]
+            ]); 
+
+        } catch (Exception $e) {
+
+            http_response_code(500);
+
+            echo json_encode([
+                'success' => false,
+                'message' => $e->getMessage()
+            ]);
+        }
+    }
+
+    public function handleRouteCreate() {
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            http_response_code(421);
+            var_dump("Wrong request method. POST required.");
+            die();
+        }
+
+        $apiKey = isset(getallheaders()['X-Api-Key']) ? getallheaders()['X-Api-Key'] : null;
+        $uid = $this->lilurl->validateAPIKey($apiKey);
+        if ($apiKey === null) {
+            http_response_code(401);
+            var_dump("No API Key was provided in the headers.");
+            die();
+        }
+        if(!$uid) {
+            http_response_code(418);
+            var_dump("No user associated with API Key provided.");
+            die();
+        }
+
+        $longURL = isset($_POST['longURL']) ? $_POST['longURL'] : null;
+        if($longURL === null) {
+            http_response_code(418);
+            var_dump("No URL provided.");
+            die();
+        }
+        if(!$this->lilurl->getID($longURL)) {
+            http_response_code(400);
+            var_dump("URL provided already exist.");
+            die();
+        }
+
+        $urlID = isset($_POST['urlID']) ? $_POST['urlID'] : $this->lilurl->getRandomID();
+        
+        $this->aliasCheck($urlID, $longURL);
+
+        $groupID = isset($_POST['groupID']) ? $_POST['groupID'] : 0;
+        $malicious_check_value='unchecked';
+
+        $this->lilurl->addURL($longURL, $urlID, $uid,$groupID, $malicious_check_value);
+
+        header('Content-Type: application/json');
+
+        try {
+            echo json_encode([
+                'success' => true,
+                'message' => 'URL created successfully.',
+                'data' => [
+                    'Go_URL' => $urlID,
+                    'Long_URL' => $longURL,
+                    'Group' => $groupID,
+                    'Group_Users' => $groupID ? array_column($this->lilurl->getGroupUsers($groupID), 'uid') : null
+                ]
+            ]);
+
+        } catch (Exception $e) {
+
+            http_response_code(500);
+
+            echo json_encode([
+                'success' => false,
+                'message' => $e->getMessage()
+            ]);
+        }
+    }
+
+    public function handleRouteUpdate() {
+        if ($_SERVER['REQUEST_METHOD'] != 'PUT') {
+            http_response_code(421);
+            var_dump("Wrong request method. PUT required.");
+            die();
+        }
+        else{
+            parse_str(file_get_contents('php://input'), $_PUT);
+        }
+
+        $apiKey = isset(getallheaders()['X-Api-Key']) ? getallheaders()['X-Api-Key'] : null;
+        if ($apiKey === null) {
+            http_response_code(401);
+            var_dump("No API Key was provided in the headers.");
+            die();
+        }
+        if(!$this->lilurl->validateAPIKey($apiKey)) {
+            http_response_code(418);
+            var_dump("No user associated with API Key.");
+            die();
+        }
+
+        $urlID = isset($_PUT['urlID']) ? $_PUT['urlID'] : null;
+        if(!$this->lilurl->getURL($urlID)) {
+            http_response_code(404);
+            var_dump("URL not found.");
+            die();
+        }
+
+        $longURL = isset($_PUT['longURL']) ? $_PUT['longURL'] : http_response_code(418);
+
+        $groupID = isset($_PUT['groupID']) ? $_PUT['groupID'] : 0;
+        $malicious_check_value='unchecked';
+
+        $uid = $this->lilurl->validateAPIKey($apiKey);
+        $this->lilurl->updateURL($longURL, $urlID, $uid, $groupID, $malicious_check_value);
+
+        header('Content-Type: application/json');
+
+        try {
+            echo json_encode([
+                'success' => true,
+                'message' => 'URL updated successfully.',
+                'data' => [
+                    'Go_URL' => $urlID,
+                    'Long_URL' => $longURL,
+                    'Group' => $groupID,
+                    'Group_Users' => $groupID ? array_column($this->lilurl->getGroupUsers($groupID), 'uid') : null
+                ]
+            ]);
+
+        } catch (Exception $e) {
+
+            http_response_code(500);
+
+            echo json_encode([
+                'success' => false,
+                'message' => $e->getMessage()
+            ]);
+        }
+    }
+
+    public function handleRouteDelete() {
+        if ($_SERVER['REQUEST_METHOD'] != 'DELETE') {
+            http_response_code(421);
+            var_dump("Wrong request method. DELETE required.");
+            die();
+        }
+
+        $apiKey = isset(getallheaders()['X-Api-Key']) ? getallheaders()['X-Api-Key'] : null;
+        if ($apiKey === null) {
+            http_response_code(401);
+            var_dump("No API Key was provided in the headers.");
+            die();
+        }
+        if(!$this->lilurl->validateAPIKey($apiKey)) {
+            http_response_code(418);
+            var_dump("No user associated with API Key.");
+            die();
+        }
+
+        $urlID = isset($_GET['urlID']) ? $_GET['urlID'] : null;
+        if(!$this->lilurl->getURL($urlID)) {
+            http_response_code(404);
+            var_dump("URL not found.");
+            die();
+        }
+
+        $uid = $this->lilurl->validateAPIKey($apiKey);
+        $this->lilurl->deleteURL($urlID, $uid);
+
+        header('Content-Type: application/json');
+
+        try {
+            echo json_encode([
+                'success' => true,
+                'message' => 'URL deleted successfully.'
+            ]); 
+
+        } catch (Exception $e) {
+
+            http_response_code(500);
+
+            echo json_encode([
+                'success' => false,
+                'message' => $e->getMessage()
+            ]);
+        }
+    }
+
+    public function aliasCheck($urlID = null, $longURL = null){
+        //validate the alias if specified (data integrity)
+        if (!empty($urlID) && !preg_match('/^[\w\-]+$/', $urlID)) {
+            $this->lilurl->setErrorPOST();
+            throw new Exception('Invalid custom alias.', lilURL::ERR_INVALID_ALIAS);
+        }
+
+        //make sure alias isn't already in use
+        if (empty($this->lilurl->getURL($urlID)) === false) {
+            $this->lilurl->setErrorPOST();
+            throw new Exception('Alias is already in use. Please use a different alias.', lilURL::ERR_ALIAS_EXISTS);
+        }
+
+        // Check to see if the pair already exists in db
+        if ($this->lilurl->getIDandURL($urlID, $longURL) !== false) {
+            $this->lilurl->setErrorPOST();
+            throw new Exception('This alias/URL pair already exists.', lilURL::ERR_USED);
+        }
+    }
+
     public function renderTemplate($file, $params = [])
     {
         global $lilurl, $auth, $page;
@@ -421,11 +694,11 @@ private function handleRouteURLQRCodePNG()
 
             // Create QR code
             $qrCode = QrCode::create($shortURL)
-                ->setEncoding(new Encoding('ISO-8859-1'))
-                ->setErrorCorrectionLevel(new ErrorCorrectionLevelHigh())
+                ->setEncoding(new Encoding('UTF-8'))
+                ->setErrorCorrectionLevel(ErrorCorrectionLevel::High)
                 ->setSize(1080)
                 ->setMargin(36)
-                ->setRoundBlockSizeMode(new RoundBlockSizeModeMargin())
+                ->setRoundBlockSizeMode(RoundBlockSizeMode::Margin)
                 ->setForegroundColor(new Color(35, 31, 32))
                 ->setBackgroundColor(new Color(255, 255, 255));
 
@@ -474,10 +747,10 @@ private function handleRouteURLQRCodeSVG()
             // Create QR code
             $qrCode = QrCode::create($shortURL)
                 ->setEncoding(new Encoding('ISO-8859-1'))
-                ->setErrorCorrectionLevel(new ErrorCorrectionLevelHigh())
+                ->setErrorCorrectionLevel(ErrorCorrectionLevel::High)
                 ->setSize(1080)
                 ->setMargin(36)
-                ->setRoundBlockSizeMode(new RoundBlockSizeModeMargin())
+                ->setRoundBlockSizeMode(RoundBlockSizeMode::Margin)
                 ->setForegroundColor(new Color(35, 31, 32))
                 ->setBackgroundColor(new Color(255, 255, 255));
 
@@ -581,6 +854,58 @@ private function sanitizeURLPost(&$mode, &$userId, &$alias) {
         }
     }
 
+    private function handleRouteTokenGenerator() {
+        $this->viewTemplate = 'token-generator.php';
+
+        return [
+            'autoGenerateUUID' => true
+        ];
+    }
+
+    private function handleRouteNewUUID()
+    {
+        global $lilurl, $auth;
+
+        header('Content-Type: application/json');
+
+        try {
+
+            $uid = $auth->getUserId();
+
+            $key = Uuid::uuid4()->toString();
+            $newKey = 'go_'.$key;
+
+            $existing = $lilurl->getUserAPIKey($uid);
+
+            if ($existing) {
+
+                $lilurl->updateUserAPIKey($uid, $newKey);
+
+            } else {
+
+                $lilurl->createUserAPIKey($uid);
+
+                $lilurl->updateUserAPIKey($uid, $newKey);
+            }
+
+            echo json_encode([
+                'success' => true,
+                'apiKey' => $newKey
+            ]);
+
+        } catch (Exception $e) {
+
+            http_response_code(500);
+
+            echo json_encode([
+                'success' => false,
+                'message' => $e->getMessage()
+            ]);
+        }
+
+        exit;
+    }
+
     private function handleException(Exception $e) {
         switch ($e->getCode()) {
             case lilURL::ERR_INVALID_PROTOCOL:
@@ -630,4 +955,4 @@ private function handleException(Exception $e) {
 
         $this->flashBag->setParams($heading, $msg, $this->flashBag::FLASH_BAG_TYPE_ERROR);
     }
-}
+}
\ No newline at end of file
diff --git a/src/goRouter.php b/src/goRouter.php
index 68964274..ec9e953c 100644
--- a/src/goRouter.php
+++ b/src/goRouter.php
@@ -6,6 +6,10 @@ class GoRouter {
 
     // route names
     const ROUTE_NAME_API  = 'api';
+    const ROUTE_NAME_API_V1_READ  = 'api/v1/read';
+    const ROUTE_NAME_API_V1_CREATE  = 'api/v1/create';
+    const ROUTE_NAME_API_V1_UPDATE  = 'api/v1/update';
+    const ROUTE_NAME_API_V1_DELETE  = 'api/v1/delete';
     const ROUTE_NAME_EDIT  = 'edit';
     const ROUTE_NAME_GROUP = 'group';
     const ROUTE_NAME_GROUP_USER_ADD = 'group-user-add';
@@ -21,10 +25,16 @@ class GoRouter {
     const ROUTE_NAME_QR_SVG = 'qr-svg';
     const ROUTE_NAME_REDIRECT = 'redirect';
     const ROUTE_NAME_RESET = 'reset';
+    const ROUTE_NAME_TOKEN_GENERATOR = 'token-generator';
+    const ROUTE_NAME_NEW_UUID = 'new-uuid';
 
     // route paths
     const ROUTE_PATH_A = 'a/';
     const ROUTE_PATH_API = 'api/';
+    const ROUTE_PATH_API_V1_READ  = 'api/v1/read';
+    const ROUTE_PATH_API_V1_CREATE  = 'api/v1/create';
+    const ROUTE_PATH_API_V1_UPDATE  = 'api/v1/update';
+    const ROUTE_PATH_API_V1_DELETE  = 'api/v1/delete';
     const ROUTE_PATH_GROUP = 'a/group';
     const ROUTE_PATH_GROUP_USER_ADD = 'a/group-user-add';
     const ROUTE_PATH_GROUP_USER_REMOVE = 'a/group-user-remove';
@@ -34,7 +44,8 @@ class GoRouter {
     const ROUTE_PATH_LOGIN = 'a/login';
     const ROUTE_PATH_LOGOUT = 'a/logout';
     const ROUTE_PATH_LOOKUP = 'a/lookup';
-
+    const ROUTE_PATH_TOKEN_GENERATOR = 'a/token-generator';
+    const ROUTE_PATH_NEW_UUID = 'a/new-uuid';
     public static $corsAllowedDomains = array();
 
     protected $viewTemplate;
@@ -71,9 +82,16 @@ public function getViewParams() {
 
     public function route() {
         $this->route = NULL;
-
         if (empty($this->pathInfo)) {
             $this->route = self::ROUTE_NAME_HOME;
+        } elseif ($this->pathInfo === self::ROUTE_PATH_API_V1_READ) {
+            $this->route = self::ROUTE_NAME_API_V1_READ;
+        }  elseif ($this->pathInfo === self::ROUTE_PATH_API_V1_CREATE) {
+            $this->route = self::ROUTE_NAME_API_V1_CREATE;
+        }  elseif ($this->pathInfo === self::ROUTE_PATH_API_V1_UPDATE) {
+            $this->route = self::ROUTE_NAME_API_V1_UPDATE;
+        }  elseif ($this->pathInfo === self::ROUTE_PATH_API_V1_DELETE) {
+            $this->route = self::ROUTE_NAME_API_V1_DELETE;
         } elseif ($this->pathInfo === self::ROUTE_PATH_API) {
             $this->route = self::ROUTE_NAME_API;
         } elseif (preg_match('#^([^/]+)\.qr$#', $this->pathInfo, $matches)) {
@@ -99,7 +117,11 @@ private function routeAdmin() {
             $this->route = self::ROUTE_NAME_MANAGE;
         } elseif (isset($_GET['lookup']) || $this->pathInfo === self::ROUTE_PATH_LOOKUP) {
             $this->route = self::ROUTE_NAME_LOOKUP;
-        } elseif (preg_match('/^a\/group\/(\d+)$/', $this->pathInfo, $matches)) {
+        } elseif ($this->pathInfo === self::ROUTE_PATH_TOKEN_GENERATOR) {
+            $this->route = self::ROUTE_NAME_TOKEN_GENERATOR;
+        } elseif ($this->pathInfo === self::ROUTE_PATH_NEW_UUID) {
+            $this->route = self::ROUTE_NAME_NEW_UUID;
+        }elseif (preg_match('/^a\/group\/(\d+)$/', $this->pathInfo, $matches)) {
             $this->route = self::ROUTE_NAME_GROUP;
             $this->groupId = $matches[1];
             $this->groupMode = self::MODE_EDIT;
diff --git a/src/lilURL.php b/src/lilURL.php
index 960fe638..d069a02c 100755
--- a/src/lilURL.php
+++ b/src/lilURL.php
@@ -992,4 +992,72 @@ private function incrementRedirectCount($id) {
             array(self::PDO_PLACEHOLDER_URL_ID => $id)
         );
     }
+
+    /**
+     * Returns user's ID/ API key
+     */
+    public function getUserAPIKey($uid)
+    {
+        return $this->db->run(
+            'SELECT * FROM tblAPIKeys WHERE uid = :uid LIMIT 1',
+            array(':uid' => $uid),
+            TRUE
+        );
+    }
+
+    /**
+     * Creates API key for user if one does not exist
+     */
+    public function createUserAPIKey($uid)
+    {
+        $existing = $this->getUserAPIKey($uid);
+
+        if ($existing) {
+            return $existing->apiKey;
+        }
+
+        $key = Uuid::uuid4()->toString();
+        $uuid = 'go_'.$key;
+
+        $this->db->insert(
+            'tblAPIKeys',
+            array(
+                'apiKey' => $uuid,
+                'uid' => $uid
+            )
+        );
+
+        return $uuid;
+    }
+
+    public function updateUserAPIKey($uid, $newKey)
+    {
+        return $this->db->run(
+            'UPDATE tblAPIKeys
+             SET apiKey = :apiKey
+             WHERE uid = :uid',
+            array(
+                ':apiKey' => $newKey,
+                ':uid' => $uid
+            )
+        );
+    }
+
+    /**
+     * Validates API key and returns uid
+     */
+    public function validateAPIKey($apiKey)
+    {
+        $result = $this->db->run(
+            'SELECT uid FROM tblAPIKeys WHERE apiKey = :apiKey LIMIT 1',
+            array(':apiKey' => $apiKey),
+            TRUE
+        );
+
+        if ($result) {
+            return $result->uid;
+        }
+
+        return false;
+    }
 }
diff --git a/www/index.php b/www/index.php
index 3329b86d..cd8bf050 100755
--- a/www/index.php
+++ b/www/index.php
@@ -74,20 +74,23 @@
 } else {
     // UNL Theme
     $theme->setWDNIncludePath(__DIR__);
-    if (file_exists($theme->getWDNIncludePath() . '/wdn/templates_5.3')) {
+    if (file_exists($theme->getWDNIncludePath() . '/wdn/templates_6.0')) {
         $page->setLocalIncludePath($theme->getWDNIncludePath());
     }
 
     $page->contactinfo = $theme->renderThemeTemplate(null, 'localfooter.tpl.php');
 
-    $page->addScriptDeclaration(sprintf(<<<EOD
-    require(['wdn'], function(WDN) {
-        WDN.initializePlugin('notice');
-        WDN.setPluginParam('idm', 'login', '%s');
-        WDN.setPluginParam('idm', 'logout', '%s');
-    });
-EOD
-        , $lilurl->getBaseUrl('a/login'), $lilurl->getBaseUrl('a/logout')));
+    if ($auth->isAuthenticated()){
+        $page->addScriptDeclaration(sprintf(<<<EOD
+            window.UNL.idm.pushConfig('loginRoute', '%s');
+            window.UNL.idm.pushConfig('logoutRoute', '%s');
+            window.UNL.idm.pushConfig('serverUser', '%s');
+        EOD,
+                $lilurl->getBaseUrl('a/login'),
+                $lilurl->getBaseUrl('a/logout'),
+                $auth->isAuthenticated() ? $auth->getUserId() : ''
+            ), '', true);
+    }
 }
 
 // Shared Items
@@ -99,15 +102,6 @@
 $page->addStyleDeclaration(file_get_contents(__DIR__ . '/css/go.css'));
 $page->addHeadLink($lilurl->getBaseUrl(), 'home');
 
-$page->addScriptDeclaration("require(['jquery'], function(jq) {
-    jq(function($){
-        var \$out = $('.dcf-notice input');
-        \$out.attr('id', 'gourl_out');
-        \$out.attr('class', 'dcf-input-text dcf-w-100%');
-        \$out.attr('title', 'Your Go URL');
-    });
-});");
-
 $page->appcontrols = $savvy->render(null,'navigation.php');
 $page->maincontentarea = $savvy->render(null,'flashBag.php');
 $page->maincontentarea .= $savvy->render(null, $controller->getViewTemplate());
@@ -117,4 +111,4 @@
     $page->displayDCFNoticeMessage($siteNotice->title, $siteNotice->message, $siteNotice->type, $siteNotice->noticePath, $siteNotice->containerID);
 }
 
-echo $page;
+echo $page;
\ No newline at end of file
diff --git a/www/js/groups.js b/www/js/groups.js
new file mode 100644
index 00000000..d88d56b5
--- /dev/null
+++ b/www/js/groups.js
@@ -0,0 +1,62 @@
+const loading_table_spinner = document.getElementById('loading_table_spinner');
+const table_wrapper = document.getElementById('table_wrapper');
+
+// Make sure they are there before we try loading the table
+if (table_wrapper !== null && loading_table_spinner !== null) {
+
+    // Load it like this to avoid weird race conditions with chat widget
+    document.addEventListener('autoLoaderPostLoad', async() => {
+        const datatables = await import('/wdn/templates_6.0/js/plugins/plugin.datatables.js');
+
+        // Give it a little extra time since the chat widget isn't loaded by the plugin autoloader
+        setTimeout(() => {
+            loadTable(datatables);
+        }, 500);
+    });
+}
+
+async function loadTable(datatables) {
+    const $ = await datatables.initialize();
+    
+    $('#groups').DataTable({
+        responsive: true,
+    
+        // Sort by "Last Redirect" column descending by default
+        order: [[0, 'desc']],
+    
+        buttons: [
+            {
+                extend: 'csvHtml5',
+                text: 'Download CSV',
+                title: 'your_go_groups',
+                bom: true,
+    
+                // Exclude Actions column from export
+                exportOptions: {
+                    columns: [0]
+                }
+            }
+        ],
+    
+        layout: {
+            topStart: 'pageLength',
+            topEnd: ['search', 'buttons'],
+            bottomStart: 'info',
+            bottomEnd: 'paging'
+        },
+    
+        pageLength: 25,
+    
+        language: {
+            search: 'Search:',
+            lengthMenu: 'Show _MENU_ URLs per page',
+            info: 'Showing _START_ to _END_ of _TOTAL_ URLs',
+            emptyTable: 'No URLs found'
+        }
+    });
+
+    loading_table_spinner.classList.add('dcf-d-none!');
+    table_wrapper.classList.remove('dcf-d-none!');
+}
+
+document.dispatchEvent(new Event('goReady'));
\ No newline at end of file
diff --git a/www/js/manage.js b/www/js/manage.js
new file mode 100644
index 00000000..454a21ac
--- /dev/null
+++ b/www/js/manage.js
@@ -0,0 +1,91 @@
+const loading_table_spinner = document.getElementById('loading_table_spinner');
+const table_wrapper = document.getElementById('table_wrapper');
+
+// Make sure they are there before we try loading the table
+if (table_wrapper !== null && loading_table_spinner !== null) {
+
+    // Load it like this to avoid weird race conditions with chat widget
+    document.addEventListener('autoLoaderPostLoad', async() => {
+        const datatables = await import('/wdn/templates_6.0/js/plugins/plugin.datatables.js');
+
+        // Give it a little extra time since the chat widget isn't loaded by the plugin autoloader
+        setTimeout(() => {
+            loadTable(datatables);
+        }, 500);
+    });
+}
+
+async function loadTable(datatables) {
+    const $ = await datatables.initialize();
+
+    // console.log(JSON.stringify(window.UNL.chat));
+    
+    $('#go-urls').DataTable({
+        responsive: true,
+    
+        // Sort by "Last Redirect" column descending by default
+        order: [[4, 'desc']],
+    
+        columnDefs: [
+            // Last Redirect column
+            {
+                targets: 4,
+                type: 'date'
+            },
+    
+            // Created On column
+            {
+                targets: 5,
+                type: 'date'
+            },
+    
+            // Actions column should not be sortable/searchable
+            {
+                targets: 6,
+                orderable: false,
+                searchable: false
+            },
+    
+            // Center redirect counts
+            {
+                targets: 3,
+                className: 'dt-center'
+            }
+        ],
+    
+        buttons: [
+            {
+                extend: 'csvHtml5',
+                text: 'Download CSV',
+                title: 'your_go_urls',
+                bom: true,
+    
+                // Exclude Actions column from export
+                exportOptions: {
+                    columns: [0, 1, 2, 3, 4, 5]
+                }
+            }
+        ],
+    
+        layout: {
+            topStart: 'pageLength',
+            topEnd: ['search', 'buttons'],
+            bottomStart: 'info',
+            bottomEnd: 'paging'
+        },
+    
+        pageLength: 25,
+    
+        language: {
+            search: 'Search:',
+            lengthMenu: 'Show _MENU_ URLs per page',
+            info: 'Showing _START_ to _END_ of _TOTAL_ URLs',
+            emptyTable: 'No URLs found'
+        }
+    });
+
+    loading_table_spinner.classList.add('dcf-d-none!');
+    table_wrapper.classList.remove('dcf-d-none!');
+}
+
+document.dispatchEvent(new Event('goReady'));
\ No newline at end of file
diff --git a/www/templates/flashBag.php b/www/templates/flashBag.php
index 8f82f869..0cd8b87e 100644
--- a/www/templates/flashBag.php
+++ b/www/templates/flashBag.php
@@ -7,7 +7,16 @@
                 <div>
                     <?php if (isset($url) && !empty($url)): ?>
                         <div class="dcf-d-flex dcf-flex-col dcf-mt-4">
-                            <div class="dcf-mb-4"><?php echo $msg;?></div>
+                            <div class="dcf-mb-4">
+                                <input
+                                    type="text"
+                                    id="gourl_out"
+                                    class="dcf-input-text dcf-w-100%"
+                                    title="Your Go URL"
+                                    readonly
+                                    value="<?php echo htmlspecialchars($url ?? '', ENT_QUOTES); ?>"
+                                >
+                            </div>
                             <div class="qrCode dcf-d-flex dcf-flex-wrap dcf-flex-row dcf-ai-center dcf-jc-evenly">
                                 <figure class="dcf-mb-4">
                                     <img
@@ -52,4 +61,4 @@
             </div>
         </div>
     </div>
-<?php endif; ?>
+<?php endif; ?>
\ No newline at end of file
diff --git a/www/templates/group.php b/www/templates/group.php
index 675963b8..391e66e1 100644
--- a/www/templates/group.php
+++ b/www/templates/group.php
@@ -17,7 +17,7 @@
 <div class="dcf-bleed dcf-pt-8 dcf-pb-8">
     <div class="dcf-wrapper">
         <h2 class="dcf-txt-h4">Manage Group</h2>
-        <form class="dcf-form dcf-w-max-lg" id="group-form" method="post">
+        <form class="dcf-form dcf-max-w-lg" id="group-form" method="post">
             <input type="hidden" name="formName" value="group-form">
             <input type="hidden" name="groupID" value="<?php echo htmlspecialchars($groupID ?? ''); ?>">
             <label for="groupName">Name <small class="dcf-required">Required</small></label>
@@ -29,7 +29,7 @@
 
         <?php if (isset($group->users)) { ?>
             <h2 class="dcf-mt-6 dcf-txt-h5">Group Users</h2>
-            <form class="dcf-form dcf-w-max-lg" id="user-form" method="post" action="<?php echo htmlspecialchars($lilurl->getBaseUrl(goController::ROUTE_PATH_GROUP_USER_ADD) . '/' . urlencode($groupID ?? '')); ?>">
+            <form class="dcf-form dcf-max-w-lg" id="user-form" method="post" action="<?php echo htmlspecialchars($lilurl->getBaseUrl(goController::ROUTE_PATH_GROUP_USER_ADD) . '/' . urlencode($groupID ?? '')); ?>">
                 <input type="hidden" name="formName" value="user-form">
                 <input type="hidden" name="groupID" value="<?php echo htmlspecialchars($groupID ?? ''); ?>">
                 <label for="uid">Username <small class="dcf-required">Required</small></label>
@@ -54,6 +54,5 @@ class="dcf-btn dcf-btn-secondary dcf-txt-3xs"
             <?php } ?>
             </ol>
         <?php } ?>
-
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/www/templates/groups.php b/www/templates/groups.php
index d5ab8309..d7f3d5db 100644
--- a/www/templates/groups.php
+++ b/www/templates/groups.php
@@ -9,31 +9,34 @@
     <h2 class="dcf-txt-h4">Your Groups</h2>
     <?php $groups = $lilurl->getUserGroups($auth->getUserId()); ?>
     <?php if (count($groups) > 0): ?>
-      <table id="groups" class="dcf-w-100% go_responsive_table flush-left dcf-table dcf-txt-sm" data-order="[[ 0, &quot;asc&quot; ]]">
-        <caption class="dcf-sr-only">Your Groups</caption>
-        <thead>
-        <tr>
-          <th scope="col">Group</th>
-          <th scope="col" data-searchable="false" data-orderable="false">Actions</th>
-        </tr>
-        </thead>
-        <tbody>
-        <?php foreach ($groups as $group): ?>
+      <div id="loading_table_spinner" class="dcf-progress-spinner"></div>
+      <div id="table_wrapper" class="dcf-d-none!">
+        <table id="groups" class="dcf-w-100% go_responsive_table flush-left dcf-table" data-order="[[ 0, &quot;asc&quot; ]]">
+          <caption class="dcf-sr-only">Your Groups</caption>
+          <thead>
           <tr>
-            <td data-header="Group"><?php echo htmlspecialchars($group->groupName ?? ''); ?></td>
-            <td class="dcf-txt-sm">
-              <div class="dcf-d-flex dcf-flex-wrap dcf-col-gap-1 dcf-row-gap-1">
-                <a class="dcf-btn dcf-btn-secondary" href="<?php echo htmlspecialchars($lilurl->getBaseUrl('a/group/' . urlencode($group->groupID ?? ''))); ?>" title="Edit <?php echo htmlspecialchars($group->groupID ?? ''); ?> Go URL" >Edit</a>
-                <form class="dcf-form dcf-d-inline" action="<?php echo htmlspecialchars($lilurl->getBaseUrl('a/groups')); ?>" method="post">
-                  <input type="hidden" name="groupID" value="<?php echo htmlspecialchars($group->groupID ?? ''); ?>" />
-                  <button class="dcf-btn dcf-btn-primary" type="submit" onclick="return confirm('Are you for sure you want to delete group, \'<?php echo htmlspecialchars($group->groupName ?? ''); ?>\'?');">Delete</button>
-                </form>
-              </div>
-            </td>
+            <th scope="col">Group</th>
+            <th scope="col" data-searchable="false" data-orderable="false">Actions</th>
           </tr>
-        <?php endforeach; ?>
-        </tbody>
-      </table>
+          </thead>
+          <tbody>
+          <?php foreach ($groups as $group): ?>
+            <tr>
+              <td class="dcf-txt-sm" data-header="Group"><?php echo htmlspecialchars($group->groupName ?? ''); ?></td>
+              <td>
+                <div class="dcf-d-flex dcf-flex-wrap dcf-col-gap-1 dcf-row-gap-1">
+                  <a class="dcf-btn dcf-btn-secondary dcf-txt-xs unmc-h-fit-content" href="<?php echo htmlspecialchars($lilurl->getBaseUrl('a/group/' . urlencode($group->groupID ?? ''))); ?>" title="Edit <?php echo htmlspecialchars($group->groupID ?? ''); ?> Go URL" >Edit</a>
+                  <form class="dcf-form dcf-d-inline" action="<?php echo htmlspecialchars($lilurl->getBaseUrl('a/groups')); ?>" method="post">
+                    <input type="hidden" name="groupID" value="<?php echo htmlspecialchars($group->groupID ?? ''); ?>" />
+                    <button class="dcf-btn dcf-btn-primary dcf-txt-xs" type="submit" onclick="return confirm('Are you for sure you want to delete group, \'<?php echo htmlspecialchars($group->groupName ?? ''); ?>\'?');">Delete</button>
+                  </form>
+                </div>
+              </td>
+            </tr>
+          <?php endforeach; ?>
+          </tbody>
+        </table>
+      </div>
     <?php else: ?>
       <p>You don't have any groups yet.</p>
     <?php endif;?>
@@ -42,20 +45,7 @@
     </div>
   </div>
 </div>
+
 <?php
-$page->addScriptDeclaration("
-  require(['jquery', '/js/datatables-1.10.21.min.js'], function(jq) {
-    jq(document).ready(function ($) {
-      $('#groups').DataTable({
-        'oLanguage': {
-          'sSearch': 'Search'
-        }
-      });
-      $('.dataTables_length label').addClass('dcf-label');
-      $('.dataTables_length select').addClass('dcf-input-select dcf-d-inline-block dcf-w-10 dcf-txt-sm');
-      $('.dataTables_filter label').addClass('dcf-label');
-      $('.dataTables_filter label input').addClass('dcf-d-inline dcf-input-text dcf-txt-sm');
-      $('.dataTables_info, .dataTables_paginate, .dataTables_paginate a').addClass('dcf-txt-sm');
-    });
-  });");
+    $page->addScript($lilurl->getBaseUrl() . 'js/groups.js?v=' . filemtime(__DIR__ . '/../js/groups.js') , 'module');
 ?>
diff --git a/www/templates/linkinfo.php b/www/templates/linkinfo.php
index d8193308..79baf8df 100644
--- a/www/templates/linkinfo.php
+++ b/www/templates/linkinfo.php
@@ -14,7 +14,7 @@
 ?>
 <div class="dcf-bleed dcf-pt-8 dcf-pb-8">
     <div class="dcf-wrapper">
-        <div class="dcf-grid-full dcf-grid-halves@md dcf-col-gap-8 dcf-row-gap-8">
+        <div class="dcf-d-grid dcf-grid-cols-1 dcf-grid-cols-2@md dcf-grid-cols-12 dcf-col-gap-vw dcf-row-gap-8">
             <div>
                 <h2 class="dcf-txt-h4"><?php echo htmlspecialchars($appName ?? ''); ?> Lookup</h2>
                 <form class="dcf-form" id="lookup-form" method="post" action="<?php echo htmlspecialchars($lilurl->getBaseUrl('a/lookup')); ?>">
@@ -81,7 +81,7 @@
                     <dt>Group Users</dt>
                     <dd class="dcf-pl-6">
                         <?php if (!empty($group->users)): ?>
-                        <ul class="dcf-list-bare">
+                        <ul role="list">
                         <?php foreach($group->users as $index => $user): ?>
                             <li><?php echo htmlspecialchars($user->uid ?? ''); ?></li>
                         <?php endforeach; ?>
@@ -102,8 +102,8 @@
                     ?>
 
                     <button
-                        class="dcf-btn dcf-btn-secondary dcf-btn-toggle-modal"
-                        data-toggles-modal="qr-modal-<?php echo htmlspecialchars($link->urlID ?? ''); ?>"
+                        class="dcf-btn dcf-btn-secondary dcf-btn-toggle-dialog"
+                        data-controls="qr-modal-<?php echo htmlspecialchars($link->urlID ?? ''); ?>"
                         type="button"
                         title="QR Code for <?php echo htmlspecialchars($link->urlID ?? ''); ?> URL"
                     >
@@ -132,4 +132,4 @@ class="dcf-btn dcf-btn-secondary dcf-btn-toggle-modal"
             <?php endif; ?>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/www/templates/manage.php b/www/templates/manage.php
index 40807092..14821f25 100644
--- a/www/templates/manage.php
+++ b/www/templates/manage.php
@@ -13,134 +13,140 @@
       <h2 class="dcf-txt-h4">Your URLs</h2>
         <?php $urls = $lilurl->getUserURLs($auth->getUserId()); ?>
         <?php if (count($urls) > 0): ?>
-            <table
-                id="go-urls"
-                class="dcf-w-100% go_responsive_table flush-left dcf-table dcf-txt-sm"
-                data-order="[[ 4, &quot;desc&quot; ]]"
-            >
-                <caption class="dcf-sr-only">Your Go URLs</caption>
-                <thead>
-                    <tr>
-                        <th scope="col">Short URL</th>
-                        <th scope="col">Long URL</th>
-                        <th scope="col">Group</th>
-                        <th scope="col">Redirects</th>
-                        <th scope="col">Last Redirect</th>
-                        <th scope="col">Created&nbsp;on</th>
-                        <th scope="col" data-searchable="false" data-orderable="false">Actions</th>
-                    </tr>
-                </thead>
-                <tbody>
-                <?php foreach ($urls as $url) : ?>
-                    <?php
-                    $submitDate = $lilurl->createDateTimeFromTimestamp($url->submitDate);
-                    $lastRedirect = $lilurl->createDateTimeFromTimestamp($url->lastRedirect);
-                    $longURLDisplay = strlen($url->longURL) > 30 ?
-                        substr($url->longURL, 0, 30)."..." : htmlspecialchars($url->longURL);
-                    ?>
-                    <tr>
-                        <td data-header="Short URL">
+            <div id="loading_table_spinner" class="dcf-progress-spinner"></div>
+            <div id="table_wrapper" class="dcf-d-none!">
+                <table
+                    id="go-urls"
+                    class="dcf-w-100% go_responsive_table flush-left dcf-table"
+                    data-order="[[ 4, &quot;desc&quot; ]]"
+                >
+                    <caption class="dcf-sr-only">Your Go URLs</caption>
+                    <thead>
+                        <tr>
+                            <th scope="col">Short URL</th>
+                            <th scope="col">Long URL</th>
+                            <th scope="col">Group</th>
+                            <th scope="col">Redirects</th>
+                            <th scope="col">Last Redirect</th>
+                            <th scope="col">Created&nbsp;on</th>
+                            <th scope="col" data-searchable="false" data-orderable="false">Actions</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                    <?php foreach ($urls as $url) : ?>
+                        <?php
+                        $submitDate = $lilurl->createDateTimeFromTimestamp($url->submitDate);
+                        $lastRedirect = $lilurl->createDateTimeFromTimestamp($url->lastRedirect);
+                        $longURLDisplay = htmlspecialchars($url->longURL);
+                        ?>
+                        <tr>
+                            <td class="dcf-txt-sm" data-header="Short URL">
+                                    <a
+                                        href="<?php echo htmlspecialchars($lilurl->getBaseUrl($url->urlID)); ?>"
+                                        target="_blank"
+                                        rel="noopener"
+                                    >
+                                        <?php echo htmlspecialchars($url->urlID ?? ''); ?>
+                                    </a>
+                            </td>
+                            <td class="dcf-txt-sm" data-header="Long URL">
                                 <a
-                                    href="<?php echo htmlspecialchars($lilurl->getBaseUrl($url->urlID)); ?>"
-                                    target="_blank"
-                                    rel="noopener"
+                                    href="<?php echo $lilurl->escapeURL($url->longURL); ?>"
+                                    title="Full URL: <?php echo htmlspecialchars($url->longURL ?? ''); ?>"
                                 >
-                                    <?php echo htmlspecialchars($url->urlID ?? ''); ?>
+                                    <span style="display: inline-block; max-width: 250px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
+                                        <?php echo $longURLDisplay; ?>
+                                    </span>
                                 </a>
-                        </td>
-                        <td data-header="Long URL">
-                            <a
-                                href="<?php echo $lilurl->escapeURL($url->longURL); ?>"
-                                title="Full URL: <?php echo htmlspecialchars($url->longURL ?? ''); ?>"
+                            </td>
+                            <td class="dcf-txt-sm" data-header="Group">
+                                    <?php echo !empty($url->groupName) ? htmlspecialchars($url->groupName) : 'N/A'; ?>
+                            </td>
+                            <td class="dcf-txt-sm" data-header="Redirects">
+                                <?php echo htmlspecialchars($url->redirects ?? ''); ?>
+                            </td>
+                            <td
+                                class="dcf-txt-sm"
+                                data-header="LastRedirect"
+                                <?php if ($lastRedirect): ?>
+                                    data-search="<?php echo $lastRedirect->format('M j, Y m/d/Y') ?>"
+                                    data-order="<?php echo $lastRedirect->format('U') ?>"
+                                <?php endif; ?>
                             >
-                                <?php echo $longURLDisplay; ?>
-                            </a>
-                        </td>
-                        <td data-header="Group">
-                                <?php echo !empty($url->groupName) ? htmlspecialchars($url->groupName) : 'N/A'; ?>
-                        </td>
-                        <td data-header="Redirects">
-                            <?php echo htmlspecialchars($url->redirects ?? ''); ?>
-                        </td>
-                        <td
-                            data-header="LastRedirect"
-                            <?php if ($lastRedirect): ?>
-                                data-search="<?php echo $lastRedirect->format('M j, Y m/d/Y') ?>"
-                                data-order="<?php echo $lastRedirect->format('U') ?>"
-                            <?php endif; ?>
-                        >
-                            <?php echo !empty($lastRedirect) ? $lastRedirect->format('M j, Y') : 'Never'; ?>
-                        </td>
-                        <td
-                            data-header="Created on"
-                            <?php if ($submitDate): ?>
-                                data-search="<?php echo $submitDate->format('M j, Y m/d/Y') ?>"
-                                data-order="<?php echo $submitDate->format('U') ?>"
-                            <?php endif; ?>
-                        >
-                            <?php echo !empty($submitDate) ? $submitDate->format('M j, Y') : 'N/A'; ?>
-                        </td>
-                        <td class="dcf-txt-sm">
-                            <div class="dcf-d-flex dcf-flex-wrap dcf-col-gap-1 dcf-row-gap-1">
-                                <?php echo $savvy->render((object) array(
-                                    "id" => $url->urlID,
-                                    "srcPNG" => $lilurl->getBaseUrl($url->urlID). '.png',
-                                    "srcSVG" => $lilurl->getBaseUrl($url->urlID). '.svg',
-                                    "appName" => $appName,
-                                    ), "qrCodeModal.php");
-                                ?>
-                                <button
-                                    class="dcf-btn dcf-btn-secondary dcf-btn-toggle-modal"
-                                    data-toggles-modal="qr-modal-<?php echo htmlspecialchars($url->urlID ?? ''); ?>"
-                                    type="button"
-                                    title="QR Code for <?php echo htmlspecialchars($url->urlID ?? ''); ?> URL"
-                                >
-                                    <span class="qrImage"></span>
-                                    QR Code®
-                                </button>
-                                <a
-                                    class="dcf-btn dcf-btn-secondary"
-                                    href="<?php echo htmlspecialchars($lilurl->getBaseUrl($url->urlID . '/edit')); ?>"
-                                    title="Edit <?php echo htmlspecialchars($url->urlID ?? ''); ?> URL"
-                                >
-                                    Edit
-                                </a>
-                                <a
-                                    class="dcf-btn dcf-btn-secondary"
-                                    href="<?php echo htmlspecialchars($lilurl->getBaseUrl($url->urlID . '/reset')); ?>"
-                                    title="Reset redirect count for <?php
-                                        echo htmlspecialchars($url->urlID ?? '');
-                                        ?> URL"
-                                    onclick="return confirm('Are you sure you want to reset the redirect count for \'
-                                        <?php echo htmlspecialchars($url->urlID ?? ''); ?>\'?');"
-                                >
-                                    Reset Redirects
-                                </a>
-                                <form
-                                    class="dcf-form dcf-mb-0"
-                                    action="<?php echo htmlspecialchars($lilurl->getBaseUrl('a/links')); ?>"
-                                    method="post"
-                                >
-                                    <input
-                                        type="hidden"
-                                        name="urlID"
-                                        value="<?php echo htmlspecialchars($url->urlID ?? ''); ?>"
-                                    />
+                                <?php echo !empty($lastRedirect) ? $lastRedirect->format('M j, Y') : 'Never'; ?>
+                            </td>
+                            <td
+                                class="dcf-txt-sm"
+                                data-header="Created on"
+                                <?php if ($submitDate): ?>
+                                    data-search="<?php echo $submitDate->format('M j, Y m/d/Y') ?>"
+                                    data-order="<?php echo $submitDate->format('U') ?>"
+                                <?php endif; ?>
+                            >
+                                <?php echo !empty($submitDate) ? $submitDate->format('M j, Y') : 'N/A'; ?>
+                            </td>
+                            <td>
+                                <div class="dcf-d-flex dcf-flex-wrap dcf-col-gap-1 dcf-row-gap-1">
+                                    <?php echo $savvy->render((object) array(
+                                        "id" => $url->urlID,
+                                        "srcPNG" => $lilurl->getBaseUrl($url->urlID). '.png',
+                                        "srcSVG" => $lilurl->getBaseUrl($url->urlID). '.svg',
+                                        "appName" => $appName,
+                                        ), "qrCodeModal.php");
+                                    ?>
                                     <button
-                                        class="dcf-btn dcf-btn-primary"
-                                        type="submit"
-                                        onclick="return confirm('Are you for sure you want to delete \'
-                                            <?php echo htmlspecialchars($url->urlID ?? ''); ?>\'?');"
+                                        class="dcf-btn dcf-btn-secondary dcf-btn-toggle-dialog dcf-txt-xs"
+                                        data-controls="qr-modal-<?php echo htmlspecialchars($url->urlID ?? ''); ?>"
+                                        type="button"
+                                        title="QR Code for <?php echo htmlspecialchars($url->urlID ?? ''); ?> URL"
                                     >
-                                        Delete
+                                        <span class="qrImage"></span>
+                                        QR Code®
                                     </button>
-                                </form>
-                            </div>
-                        </td>
-                    </tr>
-                <?php endforeach; ?>
-                </tbody>
-            </table>
+                                    <a
+                                        class="dcf-btn dcf-btn-secondary dcf-txt-xs"
+                                        href="<?php echo htmlspecialchars($lilurl->getBaseUrl($url->urlID . '/edit')); ?>"
+                                        title="Edit <?php echo htmlspecialchars($url->urlID ?? ''); ?> URL"
+                                    >
+                                        Edit
+                                    </a>
+                                    <a
+                                        class="dcf-btn dcf-btn-secondary dcf-txt-xs"
+                                        href="<?php echo htmlspecialchars($lilurl->getBaseUrl($url->urlID . '/reset')); ?>"
+                                        title="Reset redirect count for <?php
+                                            echo htmlspecialchars($url->urlID ?? '');
+                                            ?> URL"
+                                        onclick="return confirm('Are you sure you want to reset the redirect count for \'
+                                            <?php echo htmlspecialchars($url->urlID ?? ''); ?>\'?');"
+                                    >
+                                        Reset Redirects
+                                    </a>
+                                    <form
+                                        class="dcf-form dcf-mb-0"
+                                        action="<?php echo htmlspecialchars($lilurl->getBaseUrl('a/links')); ?>"
+                                        method="post"
+                                    >
+                                        <input
+                                            type="hidden"
+                                            name="urlID"
+                                            value="<?php echo htmlspecialchars($url->urlID ?? ''); ?>"
+                                        />
+                                        <button
+                                            class="dcf-btn dcf-btn-primary dcf-txt-xs"
+                                            type="submit"
+                                            onclick="return confirm('Are you for sure you want to delete \'
+                                                <?php echo htmlspecialchars($url->urlID ?? ''); ?>\'?');"
+                                        >
+                                            Delete
+                                        </button>
+                                    </form>
+                                </div>
+                            </td>
+                        </tr>
+                    <?php endforeach; ?>
+                    </tbody>
+                </table>
+            </div>
         <?php else: ?>
             <p>You haven't created any Go URLs, yet.</p>
         <?php endif;?>
@@ -157,53 +163,7 @@ class="dcf-btn dcf-btn-primary dcf-mr-6"
         </div>
     </div>
 </div>
-<?php
-$page->addScriptDeclaration("
-require(['jquery', '/js/datatables-1.10.21.min.js'], function(jq) {
-    jq(function($) {
-        // do not place in dom
-        var \$entities = $('<textarea />');
-
-        //https://datatables.net/reference/option/columnDefs
-        //https://datatables.net/reference/option/columns.data
-
-        $('#go-urls').DataTable({
-            'oLanguage': {
-                'sSearch': 'Search'
-            },
-            'columnDefs': [
-                {
-                    'targets': 1,
-                    'data': function (row, type, val, meta) {
-                        if (type === 'set') {
-                            row.d = val;
-                            row.d_display = val;
-
-                            // DOM parser will decode any entities in the url ( like &amp; )
-                            // strip 'Full URL:' from the search text if present
-                            \$entities.html(/^(?:full\s*url\s*:\s*)?(.*)$/i.exec($(val).attr('title'))[1]);
 
-                            row.d_filter = \$entities.val();
-                            return;
-
-                        } else if (type === 'display') {
-                            return row.d_display;
-
-                        } else if (type === 'filter') {
-                            return row.d_filter;
-
-                        }
-
-                        return row.d;
-                    }
-                }
-            ]
-        });
-        $('.dataTables_length label').addClass('dcf-label');
-        $('.dataTables_length select').addClass('dcf-input-select dcf-d-inline-block dcf-w-10 dcf-txt-sm');
-        $('.dataTables_filter label').addClass('dcf-label');
-        $('.dataTables_filter label input').addClass('dcf-d-inline dcf-input-text dcf-txt-sm');
-        $('.dataTables_info, .dataTables_paginate, .dataTables_paginate a').addClass('dcf-txt-sm');
-    });
-});");
-?>
+<?php
+    $page->addScript($lilurl->getBaseUrl() . 'js/manage.js?v=' . filemtime(__DIR__ . '/../js/manage.js') , 'module');
+?>
\ No newline at end of file
diff --git a/www/templates/navigation.php b/www/templates/navigation.php
index 80994744..24eff4fe 100644
--- a/www/templates/navigation.php
+++ b/www/templates/navigation.php
@@ -3,6 +3,7 @@
         <li><a href="<?php echo htmlspecialchars($lilurl->getBaseUrl('a/links')); ?>">Your URLs</a></li>
         <li><a href="<?php echo htmlspecialchars($lilurl->getBaseUrl('a/groups')); ?>">Your Groups</a></li>
         <li><a href="<?php echo htmlspecialchars($lilurl->getBaseUrl('a/lookup')); ?>">URL Lookup</a></li>
+        <li><a href="<?php echo htmlspecialchars($lilurl->getBaseUrl('a/token-generator')); ?>">API Token</a></li>
         <li><a href="<?php echo htmlspecialchars($lilurl->getBaseUrl('a/logout')); ?>">Log out as <?php echo htmlspecialchars($auth->getUserDisplayName() ?? ''); ?></a></li>
     <?php else: ?>
         <li><a href="<?php echo htmlspecialchars($lilurl->getBaseUrl('a/login')); ?>">Log In</a></li>
diff --git a/www/templates/qrCodeModal.php b/www/templates/qrCodeModal.php
index c42c0db7..53a8640a 100644
--- a/www/templates/qrCodeModal.php
+++ b/www/templates/qrCodeModal.php
@@ -1,118 +1,85 @@
 <?php
     $modalId = "qr-modal-" . $context->id;
 ?>
-
-<div
+<dialog 
     class="
-        go-qr-modal
-        dcf-modal
-        dcf-bg-overlay-dark
-        dcf-fixed
-        dcf-pin-top
-        dcf-pin-left
-        dcf-h-100%
-        dcf-w-100%
-        dcf-d-flex
-        dcf-ai-center
-        dcf-jc-center
-        dcf-opacity-0
-        dcf-pointer-events-none
-        dcf-invisible"
+        dcf-dialog 
+        go-qr-modal"
     id="<?php echo $modalId; ?>"
-    aria-labelledby="<?php echo $modalId; ?>-heading"
-    aria-hidden="true"
-    role="dialog"
-    tabindex="-1"
 >
-    <div class="dcf-modal-wrapper dcf-relative dcf-h-auto dcf-overflow-y-auto" role="document">
-        <div class="dcf-modal-header dcf-wrapper dcf-pt-4 dcf-sticky dcf-pin-top">
-            <h3 id="<?php echo $modalId ?>-heading">
-                <?php echo htmlspecialchars($context->appName); ?>
-                QR Code for &apos;<?php echo htmlspecialchars($context->id); ?>&apos;
-            </h3>
-            <button
-                class="
-                    dcf-btn-close-modal
-                    dcf-btn
-                    dcf-btn-tertiary
-                    dcf-absolute
-                    dcf-pin-top
-                    dcf-pin-right
-                    dcf-z-1"
-                type="button"
-                aria-label="Close"
-            >
-                Close
-            </button>
-        </div>
-        <div
+    <div class="dcf-dialog-header dcf-wrapper dcf-pt-4 dcf-sticky dcf-pin-top">
+        <h3 id="<?php echo $modalId ?>-heading">
+            <?php echo htmlspecialchars($context->appName); ?>
+            QR Code for &apos;<?php echo htmlspecialchars($context->id); ?>&apos;
+        </h3>
+        <button
             class="
-                dcf-modal-content
-                dcf-wrapper
-                dcf-pb-4
-                dcf-mt-4
-                dcf-d-flex
-                dcf-flex-wrap
-                dcf-flex-row
-                dcf-ai-center
-                dcf-jc-evenly"
+                dcf-btn-close-dialog
+                dcf-btn
+                dcf-btn-tertiary
+                dcf-absolute
+                dcf-pin-top
+                dcf-pin-right
+                dcf-z-1"
+            type="button"
+            aria-label="Close"
         >
-            <figure class="dcf-mb-4">
-                <img
-                    style="max-height: 10rem;"
-                    data-src="<?php echo htmlspecialchars($context->srcPNG); ?>"
-                    alt="
-                        <?php echo htmlspecialchars($context->appName); ?>
-                        QR Code for &apos;
-                        <?php echo htmlspecialchars($context->id); ?>
-                        &apos;"
+            Close
+        </button>
+    </div>
+    <div
+        class="
+            dcf-dialog-content
+            dcf-wrapper
+            dcf-pb-4
+            dcf-mt-4
+            dcf-d-flex
+            dcf-flex-wrap
+            dcf-flex-row
+            dcf-ai-center
+            dcf-jc-evenly"
+    >
+        <figure class="dcf-mb-4">
+            <img
+                style="max-height: 10rem;"
+                loading="lazy"
+                src="<?php echo htmlspecialchars($context->srcPNG); ?>"
+                alt="
+                    <?php echo htmlspecialchars($context->appName); ?>
+                    QR Code for &apos;
+                    <?php echo htmlspecialchars($context->id); ?>
+                    &apos;"
+            >
+            <figcaption class="dcf-figcaption dcf-txt-center">
+                <a
+                    download="<?php echo $context->id; ?>.png"
+                    href="<?php echo htmlspecialchars($context->srcPNG); ?>"
+                    title="Download PNG Version"
                 >
-                <figcaption class="dcf-figcaption dcf-txt-center">
-                    <a
-                        download="<?php echo $context->id; ?>.png"
-                        href="<?php echo htmlspecialchars($context->srcPNG); ?>"
-                        title="Download PNG Version"
-                    >
-                        PNG Version
-                    </a>
-                </figcaption>
-            </figure>
-            <figure class="dcf-mb-4">
-                <img
-                    style="max-height: 10rem;"
-                    data-src="<?php echo htmlspecialchars($context->srcSVG); ?>"
-                    alt="
-                        <?php echo htmlspecialchars($context->appName); ?>
-                        QR Code for &apos;
-                        <?php echo htmlspecialchars($context->id); ?>
-                        &apos;"
+                    PNG Version
+                </a>
+            </figcaption>
+        </figure>
+        <figure class="dcf-mb-4">
+            <img
+                style="max-height: 10rem;"
+                loading="lazy"
+                src="<?php echo htmlspecialchars($context->srcSVG); ?>"
+                alt="
+                    <?php echo htmlspecialchars($context->appName); ?>
+                    QR Code for &apos;
+                    <?php echo htmlspecialchars($context->id); ?>
+                    &apos;"
+            >
+            <figcaption class="dcf-figcaption dcf-txt-center">
+                <a
+                    download="<?php echo $context->id; ?>.svg"
+                    href="<?php echo htmlspecialchars($context->srcSVG); ?>"
+                    title="Download SVG Version"
                 >
-                <figcaption class="dcf-figcaption dcf-txt-center">
-                    <a
-                        download="<?php echo $context->id; ?>.svg"
-                        href="<?php echo htmlspecialchars($context->srcSVG); ?>"
-                        title="Download SVG Version"
-                    >
-                        SVG Version
-                    </a>
-                </figcaption>
-            </figure>
-        </div>
+                    SVG Version
+                </a>
+            </figcaption>
+        </figure>
     </div>
-</div>
-
-<?php
-$page->addScriptDeclaration("
-// get all the modals
-document.querySelectorAll('.go-qr-modal').forEach((modal) => {
-
-    // when the modal opens
-    document.addEventListener('ModalOpenEvent_' + modal.id, (e) => {
-
-        // load any images that have not been loaded yet
-        modal.querySelectorAll(`[data-src]:not([src])`).forEach((img) => {
-            img.src = img.dataset.src;
-        });
-    });
-});
-");
+</dialog>
\ No newline at end of file
diff --git a/www/templates/token-generator.php b/www/templates/token-generator.php
new file mode 100644
index 00000000..b51ad6ad
--- /dev/null
+++ b/www/templates/token-generator.php
@@ -0,0 +1,91 @@
+<?php
+extract($viewParams);
+
+$apiKeyRow = $lilurl->getUserAPIKey($auth->getUserId());
+
+if (!$apiKeyRow) {
+    $generatedKey = $lilurl->createUserAPIKey($auth->getUserId());
+} else {
+    $generatedKey = $apiKeyRow->apiKey;
+}
+
+$maskedKey = substr($generatedKey, 0, 7) . str_repeat('*', max(strlen($generatedKey) - 7, 0));
+?>
+
+<div class="dcf-bleed dcf-pt-8 dcf-pb-8">
+    <div class="dcf-wrapper">
+        <div class="dcf-d-grid dcf-grid-cols-1 dcf-grid-cols-2@md dcf-grid-cols-12 dcf-col-gap-vw dcf-row-gap-8">
+
+            <div>
+                <h2 class="dcf-txt-h4">API Token</h2>
+
+                <p class="dcf-txt-sm">
+                    Use this token to authenticate API requests. Keep it secure and do not share it publicly.
+                </p>
+
+                <div class="dcf-form">
+                    <div class="dcf-form-group">
+                        <label for="api-key">Your API Token</label>
+
+                        <div class="dcf-input-group">
+                            <input
+                                id="api-key"
+                                type="text"
+                                readonly
+                                value="<?php echo htmlspecialchars($maskedKey); ?>"
+                            >
+
+                            <button
+                                type="button"
+                                class="dcf-btn dcf-btn-secondary"
+                                onclick="copyKey()"
+                            >
+                                Copy
+                            </button>
+                        </div>
+
+                        <span class="dcf-form-help">
+                            Click “Copy” to copy your API token to the clipboard.
+                        </span>
+                    </div>
+                </div>
+
+                <div class="dcf-mt-6 dcf-mb-6">
+                    <a
+                        class="dcf-btn dcf-btn-primary dcf-mr-6"
+                        id="generateTokenBtn"
+                    >
+                        Generate Token
+                    </a>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>
+
+<script>
+let actualApiKey = <?php echo json_encode($generatedKey); ?>;
+
+function maskKey(key) {
+    return key.substring(0, 7) + "*".repeat(Math.max(key.length - 7, 0));
+}
+
+function copyKey() {
+    navigator.clipboard.writeText(actualApiKey);
+}
+
+document.getElementById("generateTokenBtn").addEventListener("click", async () => {
+    try {
+        const res = await fetch("/a/new-uuid");
+        const data = await res.json();
+
+        if (data.success) {
+            actualApiKey = data.apiKey;
+            document.getElementById("api-key").value = maskKey(actualApiKey);
+        }
+    } catch (err) {
+        console.error("Failed to generate token:", err);
+    }
+});
+</script>
\ No newline at end of file