diff --git a/composer.lock b/composer.lock
index 4cb2f247..ff2d3aa1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -5832,16 +5832,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v6.4.4",
+            "version": "v6.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "0d9e4eb5ad413075624378f474c4167ea202de78"
+                "reference": "a2708a5da5c87d1d0d52937bdeac625df659e11f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/0d9e4eb5ad413075624378f474c4167ea202de78",
-                "reference": "0d9e4eb5ad413075624378f474c4167ea202de78",
+                "url": "https://api.github.com/repos/symfony/console/zipball/a2708a5da5c87d1d0d52937bdeac625df659e11f",
+                "reference": "a2708a5da5c87d1d0d52937bdeac625df659e11f",
                 "shasum": ""
             },
             "require": {
@@ -5906,7 +5906,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.4.4"
+                "source": "https://github.com/symfony/console/tree/v6.4.6"
             },
             "funding": [
                 {
@@ -5922,7 +5922,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-22T20:27:10+00:00"
+            "time": "2024-03-29T19:07:53+00:00"
         },
         {
             "name": "symfony/css-selector",
@@ -6058,16 +6058,16 @@
         },
         {
             "name": "symfony/error-handler",
-            "version": "v6.4.4",
+            "version": "v6.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "c725219bdf2afc59423c32793d5019d2a904e13a"
+                "reference": "64db1c1802e3a4557e37ba33031ac39f452ac5d4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/c725219bdf2afc59423c32793d5019d2a904e13a",
-                "reference": "c725219bdf2afc59423c32793d5019d2a904e13a",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/64db1c1802e3a4557e37ba33031ac39f452ac5d4",
+                "reference": "64db1c1802e3a4557e37ba33031ac39f452ac5d4",
                 "shasum": ""
             },
             "require": {
@@ -6113,7 +6113,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v6.4.4"
+                "source": "https://github.com/symfony/error-handler/tree/v6.4.6"
             },
             "funding": [
                 {
@@ -6129,7 +6129,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-22T20:27:10+00:00"
+            "time": "2024-03-19T11:56:30+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -6213,16 +6213,16 @@
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.4.0",
+            "version": "v3.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df"
+                "reference": "4e64b49bf370ade88e567de29465762e316e4224"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/a76aed96a42d2b521153fb382d418e30d18b59df",
-                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/4e64b49bf370ade88e567de29465762e316e4224",
+                "reference": "4e64b49bf370ade88e567de29465762e316e4224",
                 "shasum": ""
             },
             "require": {
@@ -6269,7 +6269,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.0"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.2"
             },
             "funding": [
                 {
@@ -6285,7 +6285,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-23T14:45:45+00:00"
+            "time": "2024-01-23T14:51:35+00:00"
         },
         {
             "name": "symfony/finder",
@@ -6353,23 +6353,23 @@
         },
         {
             "name": "symfony/http-client",
-            "version": "v6.4.5",
+            "version": "v6.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client.git",
-                "reference": "f3c86a60a3615f466333a11fd42010d4382a82c7"
+                "reference": "6a46c0ea9b099f9a5132d560a51833ffcbd5b0d9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client/zipball/f3c86a60a3615f466333a11fd42010d4382a82c7",
-                "reference": "f3c86a60a3615f466333a11fd42010d4382a82c7",
+                "url": "https://api.github.com/repos/symfony/http-client/zipball/6a46c0ea9b099f9a5132d560a51833ffcbd5b0d9",
+                "reference": "6a46c0ea9b099f9a5132d560a51833ffcbd5b0d9",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
                 "psr/log": "^1|^2|^3",
                 "symfony/deprecation-contracts": "^2.5|^3",
-                "symfony/http-client-contracts": "^3",
+                "symfony/http-client-contracts": "^3.4.1",
                 "symfony/service-contracts": "^2.5|^3"
             },
             "conflict": {
@@ -6387,7 +6387,7 @@
                 "amphp/http-client": "^4.2.1",
                 "amphp/http-tunnel": "^1.0",
                 "amphp/socket": "^1.1",
-                "guzzlehttp/promises": "^1.4",
+                "guzzlehttp/promises": "^1.4|^2.0",
                 "nyholm/psr7": "^1.0",
                 "php-http/httplug": "^1.0|^2.0",
                 "psr/http-client": "^1.0",
@@ -6426,7 +6426,7 @@
                 "http"
             ],
             "support": {
-                "source": "https://github.com/symfony/http-client/tree/v6.4.5"
+                "source": "https://github.com/symfony/http-client/tree/v6.4.6"
             },
             "funding": [
                 {
@@ -6442,20 +6442,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-03-02T12:45:30+00:00"
+            "time": "2024-04-01T20:35:50+00:00"
         },
         {
             "name": "symfony/http-client-contracts",
-            "version": "v3.4.0",
+            "version": "v3.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client-contracts.git",
-                "reference": "1ee70e699b41909c209a0c930f11034b93578654"
+                "reference": "b6b5c876b3a4ed74460e2c5ac53bbce2f12e2a7e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/1ee70e699b41909c209a0c930f11034b93578654",
-                "reference": "1ee70e699b41909c209a0c930f11034b93578654",
+                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/b6b5c876b3a4ed74460e2c5ac53bbce2f12e2a7e",
+                "reference": "b6b5c876b3a4ed74460e2c5ac53bbce2f12e2a7e",
                 "shasum": ""
             },
             "require": {
@@ -6504,7 +6504,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/http-client-contracts/tree/v3.4.0"
+                "source": "https://github.com/symfony/http-client-contracts/tree/v3.4.2"
             },
             "funding": [
                 {
@@ -6520,7 +6520,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-07-30T20:28:31+00:00"
+            "time": "2024-04-01T18:51:09+00:00"
         },
         {
             "name": "symfony/http-foundation",
@@ -6601,16 +6601,16 @@
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v6.4.5",
+            "version": "v6.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "f6947cb939d8efee137797382cb4db1af653ef75"
+                "reference": "060038863743fd0cd982be06acecccf246d35653"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f6947cb939d8efee137797382cb4db1af653ef75",
-                "reference": "f6947cb939d8efee137797382cb4db1af653ef75",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/060038863743fd0cd982be06acecccf246d35653",
+                "reference": "060038863743fd0cd982be06acecccf246d35653",
                 "shasum": ""
             },
             "require": {
@@ -6694,7 +6694,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v6.4.5"
+                "source": "https://github.com/symfony/http-kernel/tree/v6.4.6"
             },
             "funding": [
                 {
@@ -6710,20 +6710,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-03-04T21:00:47+00:00"
+            "time": "2024-04-03T06:09:15+00:00"
         },
         {
             "name": "symfony/mailer",
-            "version": "v6.4.4",
+            "version": "v6.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mailer.git",
-                "reference": "791c5d31a8204cf3db0c66faab70282307f4376b"
+                "reference": "677f34a6f4b4559e08acf73ae0aec460479e5859"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailer/zipball/791c5d31a8204cf3db0c66faab70282307f4376b",
-                "reference": "791c5d31a8204cf3db0c66faab70282307f4376b",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/677f34a6f4b4559e08acf73ae0aec460479e5859",
+                "reference": "677f34a6f4b4559e08acf73ae0aec460479e5859",
                 "shasum": ""
             },
             "require": {
@@ -6774,7 +6774,7 @@
             "description": "Helps sending emails",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/mailer/tree/v6.4.4"
+                "source": "https://github.com/symfony/mailer/tree/v6.4.6"
             },
             "funding": [
                 {
@@ -6790,20 +6790,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-03T21:33:47+00:00"
+            "time": "2024-03-27T21:14:17+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v6.4.3",
+            "version": "v6.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "5017e0a9398c77090b7694be46f20eb796262a34"
+                "reference": "14762b86918823cb42e3558cdcca62e58b5227fe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/5017e0a9398c77090b7694be46f20eb796262a34",
-                "reference": "5017e0a9398c77090b7694be46f20eb796262a34",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/14762b86918823cb42e3558cdcca62e58b5227fe",
+                "reference": "14762b86918823cb42e3558cdcca62e58b5227fe",
                 "shasum": ""
             },
             "require": {
@@ -6824,6 +6824,7 @@
                 "league/html-to-markdown": "^5.0",
                 "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
                 "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/process": "^5.4|^6.4|^7.0",
                 "symfony/property-access": "^5.4|^6.0|^7.0",
                 "symfony/property-info": "^5.4|^6.0|^7.0",
                 "symfony/serializer": "^6.3.2|^7.0"
@@ -6858,7 +6859,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v6.4.3"
+                "source": "https://github.com/symfony/mime/tree/v6.4.6"
             },
             "funding": [
                 {
@@ -6874,7 +6875,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-30T08:32:12+00:00"
+            "time": "2024-03-21T19:36:20+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -7720,16 +7721,16 @@
         },
         {
             "name": "symfony/routing",
-            "version": "v6.4.5",
+            "version": "v6.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "7fe30068e207d9c31c0138501ab40358eb2d49a4"
+                "reference": "f2591fd1f8c6e3734656b5d6b3829e8bf81f507c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/7fe30068e207d9c31c0138501ab40358eb2d49a4",
-                "reference": "7fe30068e207d9c31c0138501ab40358eb2d49a4",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/f2591fd1f8c6e3734656b5d6b3829e8bf81f507c",
+                "reference": "f2591fd1f8c6e3734656b5d6b3829e8bf81f507c",
                 "shasum": ""
             },
             "require": {
@@ -7783,7 +7784,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v6.4.5"
+                "source": "https://github.com/symfony/routing/tree/v6.4.6"
             },
             "funding": [
                 {
@@ -7799,20 +7800,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-27T12:33:30+00:00"
+            "time": "2024-03-28T13:28:49+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.4.1",
+            "version": "v3.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0"
+                "reference": "11bbf19a0fb7b36345861e85c5768844c552906e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0",
-                "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/11bbf19a0fb7b36345861e85c5768844c552906e",
+                "reference": "11bbf19a0fb7b36345861e85c5768844c552906e",
                 "shasum": ""
             },
             "require": {
@@ -7865,7 +7866,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.4.1"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.4.2"
             },
             "funding": [
                 {
@@ -7881,7 +7882,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-26T14:02:43+00:00"
+            "time": "2023-12-19T21:51:00+00:00"
         },
         {
             "name": "symfony/string",
@@ -8066,16 +8067,16 @@
         },
         {
             "name": "symfony/translation-contracts",
-            "version": "v3.4.1",
+            "version": "v3.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "06450585bf65e978026bda220cdebca3f867fde7"
+                "reference": "43810bdb2ddb5400e5c5e778e27b210a0ca83b6b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/06450585bf65e978026bda220cdebca3f867fde7",
-                "reference": "06450585bf65e978026bda220cdebca3f867fde7",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/43810bdb2ddb5400e5c5e778e27b210a0ca83b6b",
+                "reference": "43810bdb2ddb5400e5c5e778e27b210a0ca83b6b",
                 "shasum": ""
             },
             "require": {
@@ -8124,7 +8125,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v3.4.1"
+                "source": "https://github.com/symfony/translation-contracts/tree/v3.4.2"
             },
             "funding": [
                 {
@@ -8140,7 +8141,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-26T14:02:43+00:00"
+            "time": "2024-01-23T14:51:35+00:00"
         },
         {
             "name": "symfony/uid",
@@ -8218,16 +8219,16 @@
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v6.4.4",
+            "version": "v6.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "b439823f04c98b84d4366c79507e9da6230944b1"
+                "reference": "95bd2706a97fb875185b51ecaa6112ec184233d4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b439823f04c98b84d4366c79507e9da6230944b1",
-                "reference": "b439823f04c98b84d4366c79507e9da6230944b1",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/95bd2706a97fb875185b51ecaa6112ec184233d4",
+                "reference": "95bd2706a97fb875185b51ecaa6112ec184233d4",
                 "shasum": ""
             },
             "require": {
@@ -8283,7 +8284,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v6.4.4"
+                "source": "https://github.com/symfony/var-dumper/tree/v6.4.6"
             },
             "funding": [
                 {
@@ -8299,7 +8300,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-15T11:23:52+00:00"
+            "time": "2024-03-19T11:56:30+00:00"
         },
         {
             "name": "thecodingmachine/safe",
@@ -11227,12 +11228,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Roave/SecurityAdvisories.git",
-                "reference": "50e5d68481639edd6ec8ffc6d7a2ebd3465c6399"
+                "reference": "8f58125e25237ea649fd369348ca7c2a42337f86"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/50e5d68481639edd6ec8ffc6d7a2ebd3465c6399",
-                "reference": "50e5d68481639edd6ec8ffc6d7a2ebd3465c6399",
+                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/8f58125e25237ea649fd369348ca7c2a42337f86",
+                "reference": "8f58125e25237ea649fd369348ca7c2a42337f86",
                 "shasum": ""
             },
             "conflict": {
@@ -11411,7 +11412,7 @@
                 "fooman/tcpdf": "<6.2.22",
                 "forkcms/forkcms": "<5.11.1",
                 "fossar/tcpdf-parser": "<6.2.22",
-                "francoisjacquet/rosariosis": "<11",
+                "francoisjacquet/rosariosis": "<=11.5.1",
                 "frappant/frp-form-answers": "<3.1.2|>=4,<4.0.2",
                 "friendsofsymfony/oauth2-php": "<1.3",
                 "friendsofsymfony/rest-bundle": ">=1.2,<1.2.2",
@@ -11964,7 +11965,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-02T16:05:01+00:00"
+            "time": "2024-04-02T19:04:21+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -13215,16 +13216,16 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v7.0.3",
+            "version": "v7.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "2890e3a825bc0c0558526c04499c13f83e1b6b12"
+                "reference": "408105dff4c104454100730bdfd1a9cdd993f04d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/2890e3a825bc0c0558526c04499c13f83e1b6b12",
-                "reference": "2890e3a825bc0c0558526c04499c13f83e1b6b12",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/408105dff4c104454100730bdfd1a9cdd993f04d",
+                "reference": "408105dff4c104454100730bdfd1a9cdd993f04d",
                 "shasum": ""
             },
             "require": {
@@ -13258,7 +13259,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v7.0.3"
+                "source": "https://github.com/symfony/filesystem/tree/v7.0.6"
             },
             "funding": [
                 {
@@ -13274,7 +13275,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T15:02:46+00:00"
+            "time": "2024-03-21T19:37:36+00:00"
         },
         {
             "name": "symfony/options-resolver",
diff --git a/resources/js/app.js b/resources/js/app.js
index ac35ca53..dc809367 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -1,11 +1,8 @@
 import moment from 'moment'
-window.moment = moment
 import momentTimezone from 'moment-timezone'
-window.moment = momentTimezone
 
+window.moment = moment
+
+window.moment = momentTimezone
 
-import Alpine from 'alpinejs'
-import trap from '@alpinejs/focus'
-Alpine.plugin(trap)
-Alpine.start()
 window.Alpine = Alpine
diff --git a/resources/views/api/api-token-manager.blade.php b/resources/views/api/api-token-manager.blade.php
index 698b4c86..e3bd3809 100644
--- a/resources/views/api/api-token-manager.blade.php
+++ b/resources/views/api/api-token-manager.blade.php
@@ -38,137 +38,138 @@
         <x-slot name="actions">
             <x-action-message class="mr-3" on="created">
                 {{ __('Created.') }}
-                </x-jet-action-message>
+            </x-action-message>
 
-                <x-button>
-                    {{ __('Create') }}
-                    </x-jet-button>
+            <x-button>
+                {{ __('Create') }}
+            </x-button>
         </x-slot>
-        </x-jet-form-section>
-
-        @if ($this->user->tokens->isNotEmpty())
-            <x-section-border/>
-
-            <!-- Manage API Tokens -->
-            <div class="mt-10 sm:mt-0">
-                <x-action-section>
-                    <x-slot name="title">
-                        {{ __('Manage API Tokens') }}
-                    </x-slot>
-
-                    <x-slot name="description">
-                        {{ __('You may delete any of your existing tokens if they are no longer needed.') }}
-                    </x-slot>
-
-                    <!-- API Token List -->
-                    <x-slot name="content">
-                        <div class="space-y-6">
-                            @foreach ($this->user->tokens->sortBy('name') as $token)
-                                <div class="flex items-center justify-between">
-                                    <div>
-                                        {{ $token->name }}
-                                    </div>
-
-                                    <div class="flex items-center">
-                                        @if ($token->last_used_at)
-                                            <div class="text-sm text-gray-400">
-                                                {{ __('Last used') }} {{ $token->last_used_at->diffForHumans() }}
-                                            </div>
-                                        @endif
-
-                                        @if (Laravel\Jetstream\Jetstream::hasPermissions())
-                                            <button class="cursor-pointer ml-6 text-sm text-gray-400 underline"
-                                                    wire:click="manageApiTokenPermissions({{ $token->id }})">
-                                                {{ __('Permissions') }}
-                                            </button>
-                                        @endif
-
-                                        <button class="cursor-pointer ml-6 text-sm text-red-500"
-                                                wire:click="confirmApiTokenDeletion({{ $token->id }})">
-                                            {{ __('Delete') }}
-                                        </button>
-                                    </div>
-                                </div>
-                            @endforeach
-                        </div>
-                    </x-slot>
-                    </x-jet-action-section>
-            </div>
-        @endif
+    </x-form-section>
 
-        <!-- Token Value Modal -->
-        <x-dialog-modal wire:model.live="displayingToken">
-            <x-slot name="title">
-                {{ __('API Token') }}
-            </x-slot>
+    @if ($this->user->tokens->isNotEmpty())
+        <x-section-border/>
 
-            <x-slot name="content">
-                <div>
-                    {{ __('Please copy your new API token. For your security, it won\'t be shown again.') }}
-                </div>
-
-                <x-input x-ref="plaintextToken" type="text" readonly :value="$plainTextToken"
-                         class="mt-4 bg-gray-100 px-4 py-2 rounded font-mono text-sm text-gray-500 w-full"
-                         autofocus autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-                         @showing-token-modal.window="setTimeout(() => $refs.plaintextToken.select(), 250)"
-                />
-            </x-slot>
-
-            <x-slot name="footer">
-                <x-secondary-button wire:click="$set('displayingToken', false)" wire:loading.attr="disabled">
-                    {{ __('Close') }}
-                    </x-jet-secondary-button>
-            </x-slot>
-            </x-jet-dialog-modal>
-
-            <!-- API Token Permissions Modal -->
-            <x-dialog-modal wire:model.live="managingApiTokenPermissions">
+        <!-- Manage API Tokens -->
+        <div class="mt-10 sm:mt-0">
+            <x-action-section>
                 <x-slot name="title">
-                    {{ __('API Token Permissions') }}
+                    {{ __('Manage API Tokens') }}
                 </x-slot>
 
+                <x-slot name="description">
+                    {{ __('You may delete any of your existing tokens if they are no longer needed.') }}
+                </x-slot>
+
+                <!-- API Token List -->
                 <x-slot name="content">
-                    <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-                        @foreach (Laravel\Jetstream\Jetstream::$permissions as $permission)
-                            <label class="flex items-center">
-                                <x-checkbox wire:model="updateApiTokenForm.permissions" :value="$permission"/>
-                                <span class="ml-2 text-sm text-gray-600">{{ $permission }}</span>
-                            </label>
+                    <div class="space-y-6">
+                        @foreach ($this->user->tokens->sortBy('name') as $token)
+                            <div class="flex items-center justify-between">
+                                <div>
+                                    {{ $token->name }}
+                                </div>
+
+                                <div class="flex items-center">
+                                    @if ($token->last_used_at)
+                                        <div class="text-sm text-gray-400">
+                                            {{ __('Last used') }} {{ $token->last_used_at->diffForHumans() }}
+                                        </div>
+                                    @endif
+
+                                    @if (Laravel\Jetstream\Jetstream::hasPermissions())
+                                        <button class="cursor-pointer ml-6 text-sm text-gray-400 underline"
+                                                wire:click="manageApiTokenPermissions({{ $token->id }})">
+                                            {{ __('Permissions') }}
+                                        </button>
+                                    @endif
+
+                                    <button class="cursor-pointer ml-6 text-sm text-red-500"
+                                            wire:click="confirmApiTokenDeletion({{ $token->id }})">
+                                        {{ __('Delete') }}
+                                    </button>
+                                </div>
+                            </div>
                         @endforeach
                     </div>
                 </x-slot>
+            </x-action-section>
+        </div>
+    @endif
 
-                <x-slot name="footer">
-                    <x-secondary-button wire:click="$set('managingApiTokenPermissions', false)"
-                                        wire:loading.attr="disabled">
-                        {{ __('Cancel') }}
-                        </x-jet-secondary-button>
+    <!-- Token Value Modal -->
+    <x-dialog-modal wire:model.live="displayingToken">
+        <x-slot name="title">
+            {{ __('API Token') }}
+        </x-slot>
 
-                        <x-button class="ml-2" wire:click="updateApiToken" wire:loading.attr="disabled">
-                            {{ __('Save') }}
-                            </x-jet-button>
-                </x-slot>
-                </x-jet-dialog-modal>
-
-                <!-- Delete Token Confirmation Modal -->
-                <x-confirmation-modal wire:model.live="confirmingApiTokenDeletion">
-                    <x-slot name="title">
-                        {{ __('Delete API Token') }}
-                    </x-slot>
-
-                    <x-slot name="content">
-                        {{ __('Are you sure you would like to delete this API token?') }}
-                    </x-slot>
-
-                    <x-slot name="footer">
-                        <x-secondary-button wire:click="$toggle('confirmingApiTokenDeletion')"
-                                            wire:loading.attr="disabled">
-                            {{ __('Cancel') }}
-                            </x-jet-secondary-button>
-
-                            <x-danger-button class="ml-2" wire:click="deleteApiToken" wire:loading.attr="disabled">
-                                {{ __('Delete') }}
-                                </x-jet-danger-button>
-                    </x-slot>
-                    </x-jet-confirmation-modal>
+        <x-slot name="content">
+            <div>
+                {{ __('Please copy your new API token. For your security, it won\'t be shown again.') }}
+            </div>
+
+            <x-input x-ref="plaintextToken" type="text" readonly :value="$plainTextToken"
+                     class="mt-4 bg-gray-100 px-4 py-2 rounded font-mono text-sm text-gray-500 w-full"
+                     autofocus autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+                     @showing-token-modal.window="setTimeout(() => $refs.plaintextToken.select(), 250)"
+            />
+        </x-slot>
+
+        <x-slot name="footer">
+            <x-secondary-button wire:click="$set('displayingToken', false)" wire:loading.attr="disabled">
+                {{ __('Close') }}
+            </x-secondary-button>
+        </x-slot>
+    </x-dialog-modal>
+
+    <!-- API Token Permissions Modal -->
+    <x-dialog-modal wire:model.live="managingApiTokenPermissions">
+        <x-slot name="title">
+            {{ __('API Token Permissions') }}
+        </x-slot>
+
+        <x-slot name="content">
+            <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+                @foreach (Laravel\Jetstream\Jetstream::$permissions as $permission)
+                    <label class="flex items-center">
+                        <x-checkbox wire:model="updateApiTokenForm.permissions" :value="$permission"/>
+                        <span class="ml-2 text-sm text-gray-600">{{ $permission }}</span>
+                    </label>
+                @endforeach
+            </div>
+        </x-slot>
+
+        <x-slot name="footer">
+            <x-secondary-button wire:click="$set('managingApiTokenPermissions', false)"
+                                wire:loading.attr="disabled">
+                {{ __('Cancel') }}
+            </x-secondary-button>
+
+            <x-button class="ml-2" wire:click="updateApiToken" wire:loading.attr="disabled">
+                {{ __('Save') }}
+            </x-button>
+        </x-slot>
+    </x-dialog-modal>
+
+    <!-- Delete Token Confirmation Modal -->
+    <x-confirmation-modal wire:model.live="confirmingApiTokenDeletion">
+        <x-slot name="title">
+            {{ __('Delete API Token') }}
+        </x-slot>
+
+        <x-slot name="content">
+            {{ __('Are you sure you would like to delete this API token?') }}
+        </x-slot>
+
+        <x-slot name="footer">
+            <x-secondary-button wire:click="$toggle('confirmingApiTokenDeletion')"
+                                wire:loading.attr="disabled">
+                {{ __('Cancel') }}
+            </x-secondary-button>
+
+            <x-danger-button class="ml-2" wire:click="deleteApiToken"
+                             wire:loading.attr="disabled">
+                {{ __('Delete') }}
+            </x-danger-button>
+        </x-slot>
+    </x-confirmation-modal>
 </div>
diff --git a/resources/views/auth/confirm-password.blade.php b/resources/views/auth/confirm-password.blade.php
index 5c97004e..97a43a79 100644
--- a/resources/views/auth/confirm-password.blade.php
+++ b/resources/views/auth/confirm-password.blade.php
@@ -22,8 +22,8 @@
             <div class="flex justify-end mt-4">
                 <x-button class="ml-4">
                     {{ __('Confirm') }}
-                    </x-jet-button>
+                </x-button>
             </div>
         </form>
-        </x-jet-authentication-card>
+    </x-authentication-card>
 </x-guest-layout>
diff --git a/resources/views/auth/forgot-password.blade.php b/resources/views/auth/forgot-password.blade.php
index 47337692..96a5a0db 100644
--- a/resources/views/auth/forgot-password.blade.php
+++ b/resources/views/auth/forgot-password.blade.php
@@ -28,8 +28,8 @@
             <div class="flex items-center justify-end mt-4">
                 <x-button>
                     {{ __('Email Password Reset Link') }}
-                    </x-jet-button>
+                </x-button>
             </div>
         </form>
-        </x-jet-authentication-card>
+    </x-authentication-card>
 </x-guest-layout>
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 46d6c3e3..43fac8a1 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -44,8 +44,8 @@
 
                 <x-button class="ml-4">
                     {{ __('Log in') }}
-                    </x-jet-button>
+                </x-button>
             </div>
         </form>
-        </x-jet-authentication-card>
+    </x-authentication-card>
 </x-guest-layout>
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index ef523f8e..4eb1b865 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -45,7 +45,7 @@
                                 ]) !!}
                             </div>
                         </div>
-                        </x-jet-label>
+                    </x-label>
                 </div>
             @endif
 
@@ -56,8 +56,8 @@
 
                 <x-button class="ml-4">
                     {{ __('Register') }}
-                    </x-jet-button>
+                </x-button>
             </div>
         </form>
-        </x-jet-authentication-card>
+    </x-authentication-card>
 </x-guest-layout>
diff --git a/resources/views/auth/reset-password.blade.php b/resources/views/auth/reset-password.blade.php
index fe27db6f..e5880bf3 100644
--- a/resources/views/auth/reset-password.blade.php
+++ b/resources/views/auth/reset-password.blade.php
@@ -32,8 +32,8 @@
             <div class="flex items-center justify-end mt-4">
                 <x-button>
                     {{ __('Reset Password') }}
-                    </x-jet-button>
+                </x-button>
             </div>
         </form>
-        </x-jet-authentication-card>
+    </x-authentication-card>
 </x-guest-layout>
diff --git a/resources/views/auth/two-factor-challenge.blade.php b/resources/views/auth/two-factor-challenge.blade.php
index c6a054b9..653363d7 100644
--- a/resources/views/auth/two-factor-challenge.blade.php
+++ b/resources/views/auth/two-factor-challenge.blade.php
@@ -51,9 +51,9 @@
 
                     <x-button class="ml-4">
                         {{ __('Log in') }}
-                        </x-jet-button>
+                    </x-button>
                 </div>
             </form>
         </div>
-        </x-jet-authentication-card>
+    </x-authentication-card>
 </x-guest-layout>
diff --git a/resources/views/auth/verify-email.blade.php b/resources/views/auth/verify-email.blade.php
index 7ead5ce3..285e2db1 100644
--- a/resources/views/auth/verify-email.blade.php
+++ b/resources/views/auth/verify-email.blade.php
@@ -21,7 +21,7 @@
                 <div>
                     <x-button type="submit">
                         {{ __('Resend Verification Email') }}
-                        </x-jet-button>
+                    </x-button>
                 </div>
             </form>
 
@@ -33,5 +33,5 @@
                 </button>
             </form>
         </div>
-        </x-jet-authentication-card>
+    </x-authentication-card>
 </x-guest-layout>
diff --git a/resources/views/components/action-section.blade.php b/resources/views/components/action-section.blade.php
index 4ab1ce92..3ee620ff 100644
--- a/resources/views/components/action-section.blade.php
+++ b/resources/views/components/action-section.blade.php
@@ -2,11 +2,11 @@
     <x-jet-section-title>
         <x-slot name="title">{{ $title }}</x-slot>
         <x-slot name="description">{{ $description }}</x-slot>
-    </x-jet-section-title>
+        </x-section-title>
 
-    <div class="mt-5 md:mt-0 md:col-span-2">
-        <div class="px-4 py-5 sm:p-6 bg-white shadow sm:rounded-lg">
-            {{ $content }}
+        <div class="mt-5 md:mt-0 md:col-span-2">
+            <div class="px-4 py-5 sm:p-6 bg-white shadow sm:rounded-lg">
+                {{ $content }}
+            </div>
         </div>
-    </div>
 </div>
diff --git a/resources/views/components/confirmation-modal.blade.php b/resources/views/components/confirmation-modal.blade.php
index 598df719..31b4ee51 100644
--- a/resources/views/components/confirmation-modal.blade.php
+++ b/resources/views/components/confirmation-modal.blade.php
@@ -3,9 +3,12 @@
 <x-jet-modal :id="$id" :maxWidth="$maxWidth" {{ $attributes }}>
     <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
         <div class="sm:flex sm:items-start">
-            <div class="mx-auto shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-red-100 sm:mx-0 sm:h-10 sm:w-10">
-                <svg class="h-6 w-6 text-red-600" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
-                    <path stroke-linecap="round" stroke-linejoin="round" d="M12 9v3.75m-9.303 3.376c-.866 1.5.217 3.374 1.948 3.374h14.71c1.73 0 2.813-1.874 1.948-3.374L13.949 3.378c-.866-1.5-3.032-1.5-3.898 0L2.697 16.126zM12 15.75h.007v.008H12v-.008z" />
+            <div
+                class="mx-auto shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-red-100 sm:mx-0 sm:h-10 sm:w-10">
+                <svg class="h-6 w-6 text-red-600" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                     stroke-width="1.5" stroke="currentColor">
+                    <path stroke-linecap="round" stroke-linejoin="round"
+                          d="M12 9v3.75m-9.303 3.376c-.866 1.5.217 3.374 1.948 3.374h14.71c1.73 0 2.813-1.874 1.948-3.374L13.949 3.378c-.866-1.5-3.032-1.5-3.898 0L2.697 16.126zM12 15.75h.007v.008H12v-.008z"/>
                 </svg>
             </div>
 
@@ -24,4 +27,4 @@
     <div class="flex flex-row justify-end px-6 py-4 bg-gray-100 text-right">
         {{ $footer }}
     </div>
-</x-jet-modal>
+    </x-modal>
diff --git a/resources/views/components/confirms-password.blade.php b/resources/views/components/confirms-password.blade.php
index d997b130..8e9057e8 100644
--- a/resources/views/components/confirms-password.blade.php
+++ b/resources/views/components/confirms-password.blade.php
@@ -15,32 +15,35 @@
 </span>
 
 @once
-<x-jet-dialog-modal wire:model="confirmingPassword">
-    <x-slot name="title">
-        {{ $title }}
-    </x-slot>
-
-    <x-slot name="content">
-        {{ $content }}
-
-        <div class="mt-4" x-data="{}" x-on:confirming-password.window="setTimeout(() => $refs.confirmable_password.focus(), 250)">
-            <x-jet-input type="password" class="mt-1 block w-3/4" placeholder="{{ __('Password') }}" autocomplete="current-password"
-                        x-ref="confirmable_password"
-                        wire:model.defer="confirmablePassword"
-                        wire:keydown.enter="confirmPassword" />
-
-            <x-jet-input-error for="confirmable_password" class="mt-2" />
-        </div>
-    </x-slot>
-
-    <x-slot name="footer">
-        <x-jet-secondary-button wire:click="stopConfirmingPassword" wire:loading.attr="disabled">
-            {{ __('Cancel') }}
-        </x-jet-secondary-button>
-
-        <x-jet-button class="ml-3" dusk="confirm-password-button" wire:click="confirmPassword" wire:loading.attr="disabled">
-            {{ $button }}
-        </x-jet-button>
-    </x-slot>
-</x-jet-dialog-modal>
+    <x-jet-dialog-modal wire:model="confirmingPassword">
+        <x-slot name="title">
+            {{ $title }}
+        </x-slot>
+
+        <x-slot name="content">
+            {{ $content }}
+
+            <div class="mt-4" x-data="{}"
+                 x-on:confirming-password.window="setTimeout(() => $refs.confirmable_password.focus(), 250)">
+                <x-jet-input type="password" class="mt-1 block w-3/4" placeholder="{{ __('Password') }}"
+                             autocomplete="current-password"
+                             x-ref="confirmable_password"
+                             wire:model.defer="confirmablePassword"
+                             wire:keydown.enter="confirmPassword"/>
+
+                <x-jet-input-error for="confirmable_password" class="mt-2"/>
+            </div>
+        </x-slot>
+
+        <x-slot name="footer">
+            <x-jet-secondary-button wire:click="stopConfirmingPassword" wire:loading.attr="disabled">
+                {{ __('Cancel') }}
+                </x-secondary-button>
+
+                <x-jet-button class="ml-3" dusk="confirm-password-button" wire:click="confirmPassword"
+                              wire:loading.attr="disabled">
+                    {{ $button }}
+                    </x-button>
+        </x-slot>
+        </x-dialog-modal>
 @endonce
diff --git a/resources/views/components/dialog-modal.blade.php b/resources/views/components/dialog-modal.blade.php
index 0935941a..5ed9dd09 100644
--- a/resources/views/components/dialog-modal.blade.php
+++ b/resources/views/components/dialog-modal.blade.php
@@ -14,4 +14,4 @@
     <div class="flex flex-row justify-end px-6 py-4 bg-gray-100 text-right">
         {{ $footer }}
     </div>
-</x-jet-modal>
+    </x-modal>
diff --git a/resources/views/components/error-message.blade.php b/resources/views/components/error-message.blade.php
new file mode 100644
index 00000000..340e2590
--- /dev/null
+++ b/resources/views/components/error-message.blade.php
@@ -0,0 +1,2 @@
+<p class="text-sm text-red">{{ $message }}</p>
+
diff --git a/resources/views/components/form-section.blade.php b/resources/views/components/form-section.blade.php
index 791387bf..cef8e0ff 100644
--- a/resources/views/components/form-section.blade.php
+++ b/resources/views/components/form-section.blade.php
@@ -4,21 +4,23 @@
     <x-jet-section-title>
         <x-slot name="title">{{ $title }}</x-slot>
         <x-slot name="description">{{ $description }}</x-slot>
-    </x-jet-section-title>
+        </x-section-title>
 
-    <div class="mt-5 md:mt-0 md:col-span-2">
-        <form wire:submit.prevent="{{ $submit }}">
-            <div class="px-4 py-5 bg-white sm:p-6 shadow {{ isset($actions) ? 'sm:rounded-tl-md sm:rounded-tr-md' : 'sm:rounded-md' }}">
-                <div class="grid grid-cols-6 gap-6">
-                    {{ $form }}
+        <div class="mt-5 md:mt-0 md:col-span-2">
+            <form wire:submit.prevent="{{ $submit }}">
+                <div
+                    class="px-4 py-5 bg-white sm:p-6 shadow {{ isset($actions) ? 'sm:rounded-tl-md sm:rounded-tr-md' : 'sm:rounded-md' }}">
+                    <div class="grid grid-cols-6 gap-6">
+                        {{ $form }}
+                    </div>
                 </div>
-            </div>
 
-            @if (isset($actions))
-                <div class="flex items-center justify-end px-4 py-3 bg-gray-50 text-right sm:px-6 shadow sm:rounded-bl-md sm:rounded-br-md">
-                    {{ $actions }}
-                </div>
-            @endif
-        </form>
-    </div>
+                @if (isset($actions))
+                    <div
+                        class="flex items-center justify-end px-4 py-3 bg-gray-50 text-right sm:px-6 shadow sm:rounded-bl-md sm:rounded-br-md">
+                        {{ $actions }}
+                    </div>
+                @endif
+            </form>
+        </div>
 </div>
diff --git a/resources/views/components/input-error.blade.php b/resources/views/components/input-error.blade.php
deleted file mode 100644
index b5ad9689..00000000
--- a/resources/views/components/input-error.blade.php
+++ /dev/null
@@ -1,5 +0,0 @@
-@props(['for'])
-
-@error($for)
-    <p {{ $attributes->merge(['class' => 'text-sm text-red-600']) }}>{{ $message }}</p>
-@enderror
diff --git a/resources/views/components/nav-link.blade.php b/resources/views/components/nav-link.blade.php
index 70926427..47dcb7e0 100644
--- a/resources/views/components/nav-link.blade.php
+++ b/resources/views/components/nav-link.blade.php
@@ -1,11 +1,4 @@
-@props(['active'])
-
-@php
-$classes = ($active ?? false)
-            ? 'inline-flex items-center px-1 pt-1 border-b-2 border-indigo-400 text-sm font-medium leading-5 text-gray-900 focus:outline-none focus:border-indigo-700 transition'
-            : 'inline-flex items-center px-1 pt-1 border-b-2 border-transparent text-sm font-medium leading-5 text-gray-500 hover:text-gray-700 hover:border-gray-300 focus:outline-none focus:text-gray-700 focus:border-gray-300 transition';
-@endphp
-
-<a {{ $attributes->merge(['class' => $classes]) }}>
-    {{ $slot }}
+<a href="{{ $link }}"
+   class="{{ request()->routeIs($routeName) ? '-mb-1 border-red border-b-4 text-gray-darkest font-bold' : 'border-transparent hover:border-gray-300 text-gray-dark' }} inline-flex items-center px-1 pt-1 hover:text-gray-darkest text-base font-medium">
+    {{ $name }}
 </a>
diff --git a/resources/views/livewire/submit-you-tube-live-stream.blade.php b/resources/views/livewire/submit-you-tube-live-stream.blade.php
index a2d814af..6dec236f 100644
--- a/resources/views/livewire/submit-you-tube-live-stream.blade.php
+++ b/resources/views/livewire/submit-you-tube-live-stream.blade.php
@@ -4,11 +4,11 @@
 
             <!-- Global message like success -->
             @if (session()->has('message'))
-                    <div class="mb-4 px-4 py-2 text-sm text-white bg-green text-center">
-                        {{ session('message') }}
-                    </div>
+                <div class="mb-4 px-4 py-2 text-sm text-white bg-green text-center">
+                    {{ session('message') }}
+                </div>
             @endif
-        <!-- Global message like success -->
+            <!-- Global message like success -->
 
             <!-- Form -->
             <form wire:submit="submit">
@@ -19,19 +19,19 @@
 
                             <!-- YouTube ID field -->
                             <div>
-                                <x-submission-label for="youTubeIdOrUrl" text="YouTube Stream URL" />
+                                <x-submission-label for="youTubeIdOrUrl" text="YouTube Stream URL"/>
                                 <input id="youTubeIdOrUrl" type="text" wire:model.live="youTubeIdOrUrl"
                                        placeholder="e.g. https://www.youtube.com/watch?v=1234"
                                        class="mt-1 focus:ring-red focus:border-red block w-full shadow-sm sm:text-sm border-gray-light rounded-md text-gray-darkest"/>
                                 @error('youTubeIdOrUrl')
-                                <x-input-error :message="$message"/>
+                                <x-error-message :message="$message"/>
                                 @enderror
                             </div>
                             <!-- YouTube ID field -->
 
                             <!-- Language code field -->
                             <div class="">
-                                <x-submission-label for="languageCode" text="Language" />
+                                <x-submission-label for="languageCode" text="Language"/>
                                 <select wire:model="languageCode" id="languageCode"
                                         class="mt-1 focus:ring-red focus:border-red block w-full shadow-sm sm:text-sm border-gray-light rounded-md text-gray-darkest">
                                     @foreach(\App\Models\Language::query()->orderBy('name')->get() as $country)
@@ -40,7 +40,7 @@ class="mt-1 focus:ring-red focus:border-red block w-full shadow-sm sm:text-sm bo
                                     @endforeach
                                 </select>
                                 @error('languageCode')
-                                <x-input-error :message="$message"/>
+                                <x-error-message :message="$message"/>
                                 @enderror
                             </div>
                             <!-- Language code field -->
@@ -48,12 +48,12 @@ class="mt-1 focus:ring-red focus:border-red block w-full shadow-sm sm:text-sm bo
                             <!-- E-mail field -->
                             <div>
 
-                                <x-submission-label for="submittedByEmail" text="Your E-Mail" />
+                                <x-submission-label for="submittedByEmail" text="Your E-Mail"/>
                                 <input wire:model.live="submittedByEmail" type="text" id="submittedByEmail"
                                        class="mt-1 focus:ring-red focus:border-red block w-full shadow-sm sm:text-sm border-gray-light rounded-md text-gray-darkest"
                                        placeholder="e.g. tim@larastreamers.com"/>
                                 @error('submittedByEmail')
-                                <x-input-error :message="$message"/>
+                                <x-error-message :message="$message"/>
                                 @enderror
                             </div>
                             <!-- E-mail field -->
diff --git a/resources/views/navigation-menu.blade.php b/resources/views/navigation-menu.blade.php
index 172463d1..41930a42 100644
--- a/resources/views/navigation-menu.blade.php
+++ b/resources/views/navigation-menu.blade.php
@@ -12,9 +12,10 @@
 
                 <!-- Navigation Links -->
                 <div class="hidden space-x-8 sm:-my-px sm:ml-10 sm:flex">
-                    <x-nav-link href="{{ route('dashboard') }}" :active="request()->routeIs('dashboard')">
+                    <x-nav-link :link="route('dashboard')" name="Dashboard" route-name="dashboard"
+                                :active="request()->routeIs('dashboard')">
                         {{ __('Dashboard') }}
-                        </x-jet-nav-link>
+                    </x-nav-link>
                 </div>
             </div>
 
@@ -49,27 +50,27 @@ class="inline-flex items-center px-3 py-2 border border-transparent text-sm lead
                                     <!-- Team Settings -->
                                     <x-dropdown-link href="{{ route('teams.show', Auth::user()->currentTeam->id) }}">
                                         {{ __('Team Settings') }}
-                                        </x-jet-dropdown-link>
+                                    </x-dropdown-link>
 
-                                        @can('create', Laravel\Jetstream\Jetstream::newTeamModel())
-                                            <x-dropdown-link href="{{ route('teams.create') }}">
-                                                {{ __('Create New Team') }}
-                                                </x-jet-dropdown-link>
-                                                @endcan
+                                    @can('create', Laravel\Jetstream\Jetstream::newTeamModel())
+                                        <x-dropdown-link href="{{ route('teams.create') }}">
+                                            {{ __('Create New Team') }}
+                                        </x-dropdown-link>
+                                    @endcan
 
-                                                <div class="border-t border-gray-100"></div>
+                                    <div class="border-t border-gray-100"></div>
 
-                                                <!-- Team Switcher -->
-                                                <div class="block px-4 py-2 text-xs text-gray-400">
-                                                    {{ __('Switch Teams') }}
-                                                </div>
+                                    <!-- Team Switcher -->
+                                    <div class="block px-4 py-2 text-xs text-gray-400">
+                                        {{ __('Switch Teams') }}
+                                    </div>
 
-                                                @foreach (Auth::user()->allTeams() as $team)
-                                                    <x-switchable-team :team="$team"/>
+                                    @foreach (Auth::user()->allTeams() as $team)
+                                        <x-switchable-team :team="$team"/>
                                     @endforeach
                                 </div>
                             </x-slot>
-                            </x-jet-dropdown>
+                        </x-dropdown>
                     </div>
                 @endif
 
@@ -108,28 +109,28 @@ class="inline-flex items-center px-3 py-2 border border-transparent text-sm lead
 
                             <x-dropdown-link href="{{ route('profile.show') }}">
                                 {{ __('Profile') }}
-                                </x-jet-dropdown-link>
+                            </x-dropdown-link>
 
-                                @if (Laravel\Jetstream\Jetstream::hasApiFeatures())
-                                    <x-dropdown-link href="{{ route('api-tokens.index') }}">
-                                        {{ __('API Tokens') }}
-                                        </x-jet-dropdown-link>
-                                        @endif
+                            @if (Laravel\Jetstream\Jetstream::hasApiFeatures())
+                                <x-dropdown-link href="{{ route('api-tokens.index') }}">
+                                    {{ __('API Tokens') }}
+                                </x-dropdown-link>
+                            @endif
 
-                                        <div class="border-t border-gray-100"></div>
+                            <div class="border-t border-gray-100"></div>
 
-                                        <!-- Authentication -->
-                                        <form method="POST" action="{{ route('logout') }}">
-                                            @csrf
+                            <!-- Authentication -->
+                            <form method="POST" action="{{ route('logout') }}">
+                                @csrf
 
-                                            <x-dropdown-link href="{{ route('logout') }}"
-                                                             onclick="event.preventDefault();
+                                <x-dropdown-link href="{{ route('logout') }}"
+                                                 onclick="event.preventDefault();
                                                 this.closest('form').submit();">
-                                                {{ __('Log Out') }}
-                                                </x-jet-dropdown-link>
-                                        </form>
+                                    {{ __('Log Out') }}
+                                </x-dropdown-link>
+                            </form>
                         </x-slot>
-                        </x-jet-dropdown>
+                    </x-dropdown>
                 </div>
             </div>
 
@@ -154,7 +155,7 @@ class="inline-flex items-center justify-center p-2 rounded-md text-gray-400 hove
         <div class="pt-2 pb-3 space-y-1">
             <x-responsive-nav-link href="{{ route('dashboard') }}" :active="request()->routeIs('dashboard')">
                 {{ __('Dashboard') }}
-                </x-jet-responsive-nav-link>
+            </x-responsive-nav-link>
         </div>
 
         <!-- Responsive Settings Options -->
@@ -177,57 +178,59 @@ class="inline-flex items-center justify-center p-2 rounded-md text-gray-400 hove
                 <!-- Account Management -->
                 <x-responsive-nav-link href="{{ route('profile.show') }}" :active="request()->routeIs('profile.show')">
                     {{ __('Profile') }}
-                    </x-jet-responsive-nav-link>
+                </x-responsive-nav-link>
 
-                    @if (Laravel\Jetstream\Jetstream::hasApiFeatures())
-                        <x-responsive-nav-link href="{{ route('api-tokens.index') }}"
-                                               :active="request()->routeIs('api-tokens.index')">
-                            {{ __('API Tokens') }}
-                            </x-jet-responsive-nav-link>
-                            @endif
+                @if (Laravel\Jetstream\Jetstream::hasApiFeatures())
+                    <x-responsive-nav-link href="{{ route('api-tokens.index') }}"
+                                           :active="request()->routeIs('api-tokens.index')">
+                        {{ __('API Tokens') }}
+                    </x-responsive-nav-link>
+                @endif
 
-                            <!-- Authentication -->
-                            <form method="POST" action="{{ route('logout') }}">
-                                @csrf
+                <!-- Authentication -->
+                <form method="POST" action="{{ route('logout') }}">
+                    @csrf
 
-                                <x-responsive-nav-link href="{{ route('logout') }}"
-                                                       onclick="event.preventDefault();
+                    <x-responsive-nav-link href="{{ route('logout') }}"
+                                           onclick="event.preventDefault();
                                     this.closest('form').submit();">
-                                    {{ __('Log Out') }}
-                                    </x-jet-responsive-nav-link>
-                            </form>
-
-                            <!-- Team Management -->
-                            @if (Laravel\Jetstream\Jetstream::hasTeamFeatures())
-                                <div class="border-t border-gray-200"></div>
-
-                                <div class="block px-4 py-2 text-xs text-gray-400">
-                                    {{ __('Manage Team') }}
-                                </div>
+                        {{ __('Log Out') }}
+                    </x-responsive-nav-link>
+                </form>
 
-                                <!-- Team Settings -->
-                                <x-responsive-nav-link href="{{ route('teams.show', Auth::user()->currentTeam->id) }}"
-                                                       :active="request()->routeIs('teams.show')">
-                                    {{ __('Team Settings') }}
-                                    </x-jet-responsive-nav-link>
-
-                                    @can('create', Laravel\Jetstream\Jetstream::newTeamModel())
-                                        <x-responsive-nav-link href="{{ route('teams.create') }}"
-                                                               :active="request()->routeIs('teams.create')">
-                                            {{ __('Create New Team') }}
-                                            </x-jet-responsive-nav-link>
-                                            @endcan
+                <!-- Team Management -->
+                @if (Laravel\Jetstream\Jetstream::hasTeamFeatures())
+                    <div class="border-t border-gray-200"></div>
 
-                                            <div class="border-t border-gray-200"></div>
+                    <div class="block px-4 py-2 text-xs text-gray-400">
+                        {{ __('Manage Team') }}
+                    </div>
 
-                                            <!-- Team Switcher -->
-                                            <div class="block px-4 py-2 text-xs text-gray-400">
-                                                {{ __('Switch Teams') }}
-                                            </div>
+                    <!-- Team Settings -->
+                    <x-responsive-nav-link
+                        href="{{ route('teams.show', Auth::user()->currentTeam->id) }}"
+                        :active="request()->routeIs('teams.show')">
+                        {{ __('Team Settings') }}
+                    </x-responsive-nav-link>
+
+                    @can('create', Laravel\Jetstream\Jetstream::newTeamModel())
+                        <x-responsive-nav-link href="{{ route('teams.create') }}"
+                                               :active="request()->routeIs('teams.create')">
+                            {{ __('Create New Team') }}
+                        </x-responsive-nav-link>
+                    @endcan
+
+                    <div class="border-t border-gray-200"></div>
+
+                    <!-- Team Switcher -->
+                    <div class="block px-4 py-2 text-xs text-gray-400">
+                        {{ __('Switch Teams') }}
+                    </div>
 
-                                            @foreach (Auth::user()->allTeams() as $team)
-                                                <x-switchable-team :team="$team" component="jet-responsive-nav-link"/>
-                @endforeach
+                    @foreach (Auth::user()->allTeams() as $team)
+                        <x-switchable-team :team="$team"
+                                           component="jet-responsive-nav-link"/>
+                    @endforeach
                 @endif
             </div>
         </div>
diff --git a/resources/views/profile/delete-user-form.blade.php b/resources/views/profile/delete-user-form.blade.php
index 4d131eec..677261d8 100644
--- a/resources/views/profile/delete-user-form.blade.php
+++ b/resources/views/profile/delete-user-form.blade.php
@@ -15,7 +15,7 @@
         <div class="mt-5">
             <x-danger-button wire:click="confirmUserDeletion" wire:loading.attr="disabled">
                 {{ __('Delete Account') }}
-                </x-jet-danger-button>
+            </x-danger-button>
         </div>
 
         <!-- Delete User Confirmation Modal -->
@@ -42,12 +42,12 @@
             <x-slot name="footer">
                 <x-secondary-button wire:click="$toggle('confirmingUserDeletion')" wire:loading.attr="disabled">
                     {{ __('Cancel') }}
-                    </x-jet-secondary-button>
+                </x-secondary-button>
 
-                    <x-danger-button class="ml-2" wire:click="deleteUser" wire:loading.attr="disabled">
-                        {{ __('Delete Account') }}
-                        </x-jet-danger-button>
+                <x-danger-button class="ml-2" wire:click="deleteUser" wire:loading.attr="disabled">
+                    {{ __('Delete Account') }}
+                </x-danger-button>
             </x-slot>
-            </x-jet-dialog-modal>
+        </x-dialog-modal>
     </x-slot>
-    </x-jet-action-section>
+</x-action-section>
diff --git a/resources/views/profile/logout-other-browser-sessions-form.blade.php b/resources/views/profile/logout-other-browser-sessions-form.blade.php
index ed7f1532..06c8e65e 100644
--- a/resources/views/profile/logout-other-browser-sessions-form.blade.php
+++ b/resources/views/profile/logout-other-browser-sessions-form.blade.php
@@ -60,11 +60,11 @@ class="w-8 h-8 text-gray-500">
         <div class="flex items-center mt-5">
             <x-button wire:click="confirmLogout" wire:loading.attr="disabled">
                 {{ __('Log Out Other Browser Sessions') }}
-                </x-jet-button>
+            </x-button>
 
-                <x-action-message class="ml-3" on="loggedOut">
-                    {{ __('Done.') }}
-                    </x-jet-action-message>
+            <x-action-message class="ml-3" on="loggedOut">
+                {{ __('Done.') }}
+            </x-action-message>
         </div>
 
         <!-- Log Out Other Devices Confirmation Modal -->
@@ -91,14 +91,14 @@ class="w-8 h-8 text-gray-500">
             <x-slot name="footer">
                 <x-secondary-button wire:click="$toggle('confirmingLogout')" wire:loading.attr="disabled">
                     {{ __('Cancel') }}
-                    </x-jet-secondary-button>
+                </x-secondary-button>
 
-                    <x-button class="ml-2"
-                              wire:click="logoutOtherBrowserSessions"
-                              wire:loading.attr="disabled">
-                        {{ __('Log Out Other Browser Sessions') }}
-                        </x-jet-button>
+                <x-button class="ml-2"
+                          wire:click="logoutOtherBrowserSessions"
+                          wire:loading.attr="disabled">
+                    {{ __('Log Out Other Browser Sessions') }}
+                </x-button>
             </x-slot>
-            </x-jet-dialog-modal>
+        </x-dialog-modal>
     </x-slot>
-    </x-jet-action-section>
+</x-action-section>
diff --git a/resources/views/profile/two-factor-authentication-form.blade.php b/resources/views/profile/two-factor-authentication-form.blade.php
index 1025011f..b40ca48a 100644
--- a/resources/views/profile/two-factor-authentication-form.blade.php
+++ b/resources/views/profile/two-factor-authentication-form.blade.php
@@ -55,29 +55,31 @@
                 <x-confirms-password wire:then="enableTwoFactorAuthentication">
                     <x-button type="button" wire:loading.attr="disabled">
                         {{ __('Enable') }}
-                        </x-jet-button>
-                        </x-jet-confirms-password>
-                        @else
-                            @if ($showingRecoveryCodes)
-                                <x-confirms-password wire:then="regenerateRecoveryCodes">
-                                    <x-secondary-button class="mr-3">
-                                        {{ __('Regenerate Recovery Codes') }}
-                                        </x-jet-secondary-button>
-                                        </x-jet-confirms-password>
-                                        @else
-                                            <x-confirms-password wire:then="showRecoveryCodes">
-                                                <x-secondary-button class="mr-3">
-                                                    {{ __('Show Recovery Codes') }}
-                                                    </x-jet-secondary-button>
-                                                    </x-jet-confirms-password>
-                                                    @endif
+                    </x-button>
+                </x-confirms-password>
+            @else
+                @if ($showingRecoveryCodes)
+                    <x-confirms-password wire:then="regenerateRecoveryCodes">
+                        <x-secondary-button class="mr-3">
+                            {{ __('Regenerate Recovery Codes') }}
+                        </x-secondary-button>
+                    </x-confirms-password>
+                @else
+                    <x-confirms-password wire:then="showRecoveryCodes">
+                        <x-secondary-button class="mr-3">
+                            {{ __('Show Recovery Codes') }}
+                        </x-secondary-button>
+                    </x-confirms-password>
+                @endif
 
-                                                    <x-confirms-password wire:then="disableTwoFactorAuthentication">
-                                                        <x-danger-button wire:loading.attr="disabled">
-                                                            {{ __('Disable') }}
-                                                            </x-jet-danger-button>
-                                                            </x-jet-confirms-password>
+                <x-confirms-password
+                    wire:then="disableTwoFactorAuthentication">
+                    <x-danger-button
+                        wire:loading.attr="disabled">
+                        {{ __('Disable') }}
+                    </x-danger-button>
+                </x-confirms-password>
             @endif
         </div>
     </x-slot>
-    </x-jet-action-section>
+</x-action-section>
diff --git a/resources/views/profile/update-password-form.blade.php b/resources/views/profile/update-password-form.blade.php
index 14531884..4eb3b6d6 100644
--- a/resources/views/profile/update-password-form.blade.php
+++ b/resources/views/profile/update-password-form.blade.php
@@ -33,10 +33,10 @@
     <x-slot name="actions">
         <x-action-message class="mr-3" on="saved">
             {{ __('Saved.') }}
-            </x-jet-action-message>
+        </x-action-message>
 
-            <x-button>
-                {{ __('Save') }}
-                </x-jet-button>
+        <x-button>
+            {{ __('Save') }}
+        </x-button>
     </x-slot>
-    </x-jet-form-section>
+</x-form-section>
diff --git a/resources/views/profile/update-profile-information-form.blade.php b/resources/views/profile/update-profile-information-form.blade.php
index 620cfde5..de8d8fd3 100644
--- a/resources/views/profile/update-profile-information-form.blade.php
+++ b/resources/views/profile/update-profile-information-form.blade.php
@@ -41,15 +41,15 @@ class="rounded-full h-20 w-20 object-cover">
 
                 <x-secondary-button class="mt-2 mr-2" type="button" x-on:click.prevent="$refs.photo.click()">
                     {{ __('Select A New Photo') }}
-                    </x-jet-secondary-button>
+                </x-secondary-button>
 
-                    @if ($this->user->profile_photo_path)
-                        <x-secondary-button type="button" class="mt-2" wire:click="deleteProfilePhoto">
-                            {{ __('Remove Photo') }}
-                            </x-jet-secondary-button>
-                            @endif
+                @if ($this->user->profile_photo_path)
+                    <x-secondary-button type="button" class="mt-2" wire:click="deleteProfilePhoto">
+                        {{ __('Remove Photo') }}
+                    </x-secondary-button>
+                @endif
 
-                            <x-input-error for="photo" class="mt-2"/>
+                <x-input-error for="photo" class="mt-2"/>
             </div>
         @endif
 
@@ -71,10 +71,10 @@ class="rounded-full h-20 w-20 object-cover">
     <x-slot name="actions">
         <x-action-message class="mr-3" on="saved">
             {{ __('Saved.') }}
-            </x-jet-action-message>
+        </x-action-message>
 
-            <x-button wire:loading.attr="disabled" wire:target="photo">
-                {{ __('Save') }}
-                </x-jet-button>
+        <x-button wire:loading.attr="disabled" wire:target="photo">
+            {{ __('Save') }}
+        </x-button>
     </x-slot>
-    </x-jet-form-section>
+</x-form-section>