diff --git a/.yamllint.yml b/.yamllint.yml
index 1d8112fd5..66bafeb8f 100644
--- a/.yamllint.yml
+++ b/.yamllint.yml
@@ -9,6 +9,7 @@ yaml-files:
   - '.yamllint'
 
 ignore: |
+  api/openapi.yml
   docs/pnpm-lock.yaml
   internal/configuration/test_resources/config_bad_quoting.yml
   web/pnpm-lock.yaml
diff --git a/README.md b/README.md
index 010e9f4af..66b643c25 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="./docs/static/images/authelia-title.png" width="350" title="Authelia">
+  <img src="https://www.authelia.com/images/authelia-title.png" width="350" title="Authelia">
 </p>
 
   [![Build](https://img.shields.io/buildkite/d6543d3ece3433f46dbe5fd9fcfaf1f68a6dbc48eb1048bc22/master?logo=buildkite&style=flat-square&color=brightgreen)](https://buildkite.com/authelia/authelia)
@@ -24,7 +24,7 @@ Documentation is available at [https://www.authelia.com/](https://www.authelia.c
 The following is a simple diagram of the architecture:
 
 <p align="center" style="margin:50px">
-  <img src="./docs/static/images/archi.png"/>
+  <img src="https://www.authelia.com/images/archi.png"/>
 </p>
 
 **Authelia** can be installed as a standalone service from the [AUR](https://aur.archlinux.org/packages/authelia/),
@@ -38,15 +38,15 @@ Deployment can be orchestrated via the Helm [Chart](https://charts.authelia.com)
 and ingress configurations.
 
 <p align="center">
-  <img src="./docs/static/images/logos/kubernetes.png" height="100"/>
-  <img src="./docs/static/images/logos/docker.logo.png" width="100">
+  <img src="https://www.authelia.com/images/logos/kubernetes.png" height="100"/>
+  <img src="https://www.authelia.com/images/logos/docker.logo.png" width="100">
 </p>
 
 Here is what Authelia's portal looks like:
 
 <p align="center">
-  <img src="./docs/static/images/1FA.png" width="400" />
-  <img src="./docs/static/images/2FA-METHODS.png" width="400" />
+  <img src="https://www.authelia.com/images/1FA.png" width="400" />
+  <img src="https://www.authelia.com/images/2FA-METHODS.png" width="400" />
 </p>
 
 ## Features summary
@@ -92,11 +92,11 @@ If you want to know more about the roadmap, follow [Roadmap](https://www.autheli
 Authelia works in combination with [nginx], [Traefik], [Caddy], [Skipper], [Envoy], or [HAProxy].
 
 <p align="center">
-  <img src="./docs/static/images/logos/nginx.png" height="50"/>
-  <img src="./docs/static/images/logos/traefik.png" height="50"/>
-  <img src="./docs/static/images/logos/caddy.png" height="50"/>
-  <img src="./docs/static/images/logos/envoy.png" height="50"/>
-  <img src="./docs/static/images/logos/haproxy.png" height="50"/>
+  <img src="https://www.authelia.com/images/logos/nginx.png" height="50"/>
+  <img src="https://www.authelia.com/images/logos/traefik.png" height="50"/>
+  <img src="https://www.authelia.com/images/logos/caddy.png" height="50"/>
+  <img src="https://www.authelia.com/images/logos/envoy.png" height="50"/>
+  <img src="https://www.authelia.com/images/logos/haproxy.png" height="50"/>
 </p>
 
 ## Getting Started
@@ -330,17 +330,17 @@ Authelia.
 
 #### Balto
 
-Thank you to [<img src="./docs/static/images/logos/balto.svg" alt="Balto" width="32"> Balto](https://www.getbalto.com/)
+Thank you to [<img src="https://www.authelia.com/images/logos/balto.svg" alt="Balto" width="32"> Balto](https://www.getbalto.com/)
 for hosting our apt repository.
 
 #### JetBrains
 
-Thank you to [<img src="./docs/static/images/logos/jetbrains.svg" alt="JetBrains" width="32"> JetBrains](https://www.jetbrains.com/?from=Authelia)
+Thank you to [<img src="https://www.authelia.com/images/logos/jetbrains.svg" alt="JetBrains" width="32"> JetBrains](https://www.jetbrains.com/?from=Authelia)
 for providing us with free licenses to their great tools.
 
-* [<img src="./docs/static/images/logos/intellij-idea.svg" alt="IDEA" width="32"> IDEA](http://www.jetbrains.com/idea/)
-* [<img src="./docs/static/images/logos/goland.svg" alt="GoLand" width="32"> GoLand](http://www.jetbrains.com/go/)
-* [<img src="./docs/static/images/logos/webstorm.svg" alt="WebStorm" width="32"> WebStorm](http://www.jetbrains.com/webstorm/)
+* [<img src="https://www.authelia.com/images/logos/intellij-idea.svg" alt="IDEA" width="32"> IDEA](http://www.jetbrains.com/idea/)
+* [<img src="https://www.authelia.com/images/logos/goland.svg" alt="GoLand" width="32"> GoLand](http://www.jetbrains.com/go/)
+* [<img src="https://www.authelia.com/images/logos/webstorm.svg" alt="WebStorm" width="32"> WebStorm](http://www.jetbrains.com/webstorm/)
 
 #### Microsoft
 
@@ -348,9 +348,9 @@ Our pipeline agents which we rely on for productivity are hosted on [Azure](http
 and our [git repositories](https://github.com/authelia) are hosted on [GitHub](https://github.com/?from=Authela)
 which are both [Microsoft](https://www.microsoft.com/?from=Authelia) products.
 
-[<img src="./docs/static/images/logos/microsoft.svg" alt="microsoft" height="32">](https://www.microsoft.com/?from=Authelia)
+[<img src="https://www.authelia.com/images/logos/microsoft.svg" alt="microsoft" height="32">](https://www.microsoft.com/?from=Authelia)
 
-[<img src="./docs/static/images/logos/azure.svg" alt="Azure" height="32">](https://azure.microsoft.com/?from=Authelia)
+[<img src="https://www.authelia.com/images/logos/azure.svg" alt="Azure" height="32">](https://azure.microsoft.com/?from=Authelia)
 
 ### Open Collective
 
diff --git a/api/index.html b/api/index.html
index e7a8dfcf0..7d41d83af 100644
--- a/api/index.html
+++ b/api/index.html
@@ -4,10 +4,10 @@
   <head>
     <meta charset="UTF-8">
     <title>Swagger UI</title>
-    <link rel="stylesheet" type="text/css" href="{{.Base}}/api/swagger-ui.css" />
-    <link rel="icon" type="image/png" href="{{.Base}}/api/favicon-32x32.png" sizes="32x32" />
-    <link rel="icon" type="image/png" href="{{.Base}}/api/favicon-16x16.png" sizes="16x16" />
-    <style nonce="{{.CSPNonce}}">
+    <link rel="stylesheet" type="text/css" href="{{ .Base }}/api/swagger-ui.css" />
+    <link rel="icon" type="image/png" href="{{ .Base }}/api/favicon-32x32.png" sizes="32x32" />
+    <link rel="icon" type="image/png" href="{{ .Base }}/api/favicon-16x16.png" sizes="16x16" />
+    <style nonce="{{ .CSPNonce }}">
       html
       {
         box-sizing: border-box;
@@ -33,13 +33,13 @@
   <body>
     <div id="swagger-ui"></div>
 
-    <script src="{{.Base}}/api/swagger-ui-bundle.js" charset="UTF-8"> </script>
-    <script src="{{.Base}}/api/swagger-ui-standalone-preset.js" charset="UTF-8"> </script>
-    <script nonce="{{.CSPNonce}}">
+    <script src="{{ .Base }}/api/swagger-ui-bundle.js" charset="UTF-8"> </script>
+    <script src="{{ .Base }}/api/swagger-ui-standalone-preset.js" charset="UTF-8"> </script>
+    <script nonce="{{ .CSPNonce }}">
     window.onload = function() {
       // Begin Swagger UI call region
       const ui = SwaggerUIBundle({
-        url: "{{.Base}}/api/openapi.yml",
+        url: "{{ .Base }}/api/openapi.yml",
         dom_id: '#swagger-ui',
         deepLinking: true,
         presets: [
diff --git a/api/openapi.yml b/api/openapi.yml
index d60632d99..c5751858f 100644
--- a/api/openapi.yml
+++ b/api/openapi.yml
@@ -1,4 +1,3 @@
-# yamllint disable rule:line-length
 ---
 openapi: 3.0.3
 info:
@@ -22,18 +21,24 @@ tags:
     description: Configuration, health and state endpoints
   - name: Authentication
     description: Authentication and verification endpoints
+  {{- if .PasswordReset }}
   - name: Password Reset
     description: Password reset endpoints
   - name: User Information
     description: User configuration endpoints
+  {{- end }}
+  {{- if (or .TOTP .Webauthn .Duo) }}
   - name: Second Factor
     description: TOTP, Webauthn and Duo endpoints
     externalDocs:
       url: https://www.authelia.com/configuration/second-factor/introduction/
+  {{- end }}
+  {{- if .OpenIDConnect }}
   - name: OpenID Connect 1.0
     description: OpenID Connect 1.0 and OAuth 2.0 Endpoints
     externalDocs:
       url: https://www.authelia.com/integration/openid-connect/introduction/
+  {{- end }}
 paths:
   /api/configuration:
     get:
@@ -97,280 +102,8 @@ paths:
               schema:
                 $ref: '#/components/schemas/handlers.StateResponse'
   /api/verify:
-    get:
-      tags:
-        - Authentication
-      summary: Verification
-      description: >
-        The verify endpoint provides the ability to verify if a user has the necessary permissions to access a specified
-        domain.
-      parameters:
-        - $ref: '#/components/parameters/originalURLParam'
-        - $ref: '#/components/parameters/forwardedMethodParam'
-        - $ref: '#/components/parameters/authParam'
-      responses:
-        "200":
-          description: Successful Operation
-          headers:
-            remote-user:
-              description: Username
-              schema:
-                type: string
-                example: john
-            remote-name:
-              description: Name
-              schema:
-                type: string
-                example: John Doe
-            remote-email:
-              description: Email
-              schema:
-                type: string
-                example: john.doe@authelia.com
-            remote-groups:
-              description: Comma separated list of Groups
-              schema:
-                type: string
-                example: admin,devs
-        "401":
-          description: Unauthorized
-      security:
-        - authelia_auth: []
-    head:
-      tags:
-        - Authentication
-      summary: Verification
-      description: >
-        The verify endpoint provides the ability to verify if a user has the necessary permissions to access a specified
-        domain.
-      parameters:
-        - $ref: '#/components/parameters/originalURLParam'
-        - $ref: '#/components/parameters/forwardedMethodParam'
-        - $ref: '#/components/parameters/authParam'
-      responses:
-        "200":
-          description: Successful Operation
-          headers:
-            remote-user:
-              description: Username
-              schema:
-                type: string
-                example: john
-            remote-name:
-              description: Name
-              schema:
-                type: string
-                example: John Doe
-            remote-email:
-              description: Email
-              schema:
-                type: string
-                example: john.doe@authelia.com
-            remote-groups:
-              description: Comma separated list of Groups
-              schema:
-                type: string
-                example: admin,devs
-        "401":
-          description: Unauthorized
-      security:
-        - authelia_auth: []
-    options:
-      tags:
-        - Authentication
-      summary: Verification
-      description: >
-        The verify endpoint provides the ability to verify if a user has the necessary permissions to access a specified
-        domain.
-      parameters:
-        - $ref: '#/components/parameters/originalURLParam'
-        - $ref: '#/components/parameters/forwardedMethodParam'
-        - $ref: '#/components/parameters/authParam'
-      responses:
-        "200":
-          description: Successful Operation
-          headers:
-            remote-user:
-              description: Username
-              schema:
-                type: string
-                example: john
-            remote-name:
-              description: Name
-              schema:
-                type: string
-                example: John Doe
-            remote-email:
-              description: Email
-              schema:
-                type: string
-                example: john.doe@authelia.com
-            remote-groups:
-              description: Comma separated list of Groups
-              schema:
-                type: string
-                example: admin,devs
-        "401":
-          description: Unauthorized
-      security:
-        - authelia_auth: []
-    post:
-      tags:
-        - Authentication
-      summary: Verification
-      description: >
-        The verify endpoint provides the ability to verify if a user has the necessary permissions to access a specified
-        domain.
-      parameters:
-        - $ref: '#/components/parameters/originalURLParam'
-        - $ref: '#/components/parameters/forwardedMethodParam'
-        - $ref: '#/components/parameters/authParam'
-      responses:
-        "200":
-          description: Successful Operation
-          headers:
-            remote-user:
-              description: Username
-              schema:
-                type: string
-                example: john
-            remote-name:
-              description: Name
-              schema:
-                type: string
-                example: John Doe
-            remote-email:
-              description: Email
-              schema:
-                type: string
-                example: john.doe@authelia.com
-            remote-groups:
-              description: Comma separated list of Groups
-              schema:
-                type: string
-                example: admin,devs
-        "401":
-          description: Unauthorized
-      security:
-        - authelia_auth: []
-    put:
-      tags:
-        - Authentication
-      summary: Verification
-      description: >
-        The verify endpoint provides the ability to verify if a user has the necessary permissions to access a specified
-        domain.
-      parameters:
-        - $ref: '#/components/parameters/originalURLParam'
-        - $ref: '#/components/parameters/forwardedMethodParam'
-        - $ref: '#/components/parameters/authParam'
-      responses:
-        "200":
-          description: Successful Operation
-          headers:
-            remote-user:
-              description: Username
-              schema:
-                type: string
-                example: john
-            remote-name:
-              description: Name
-              schema:
-                type: string
-                example: John Doe
-            remote-email:
-              description: Email
-              schema:
-                type: string
-                example: john.doe@authelia.com
-            remote-groups:
-              description: Comma separated list of Groups
-              schema:
-                type: string
-                example: admin,devs
-        "401":
-          description: Unauthorized
-      security:
-        - authelia_auth: []
-    patch:
-      tags:
-        - Authentication
-      summary: Verification
-      description: >
-        The verify endpoint provides the ability to verify if a user has the necessary permissions to access a specified
-        domain.
-      parameters:
-        - $ref: '#/components/parameters/originalURLParam'
-        - $ref: '#/components/parameters/forwardedMethodParam'
-        - $ref: '#/components/parameters/authParam'
-      responses:
-        "200":
-          description: Successful Operation
-          headers:
-            remote-user:
-              description: Username
-              schema:
-                type: string
-                example: john
-            remote-name:
-              description: Name
-              schema:
-                type: string
-                example: John Doe
-            remote-email:
-              description: Email
-              schema:
-                type: string
-                example: john.doe@authelia.com
-            remote-groups:
-              description: Comma separated list of Groups
-              schema:
-                type: string
-                example: admin,devs
-        "401":
-          description: Unauthorized
-      security:
-        - authelia_auth: []
-    delete:
-      tags:
-        - Authentication
-      summary: Verification
-      description: >
-        The verify endpoint provides the ability to verify if a user has the necessary permissions to access a specified
-        domain.
-      parameters:
-        - $ref: '#/components/parameters/originalURLParam'
-        - $ref: '#/components/parameters/forwardedMethodParam'
-        - $ref: '#/components/parameters/authParam'
-      responses:
-        "200":
-          description: Successful Operation
-          headers:
-            remote-user:
-              description: Username
-              schema:
-                type: string
-                example: john
-            remote-name:
-              description: Name
-              schema:
-                type: string
-                example: John Doe
-            remote-email:
-              description: Email
-              schema:
-                type: string
-                example: john.doe@authelia.com
-            remote-groups:
-              description: Comma separated list of Groups
-              schema:
-                type: string
-                example: admin,devs
-        "401":
-          description: Unauthorized
-      security:
-        - authelia_auth: []
-    trace:
+    {{- range $method := list "get" "head" "options" "post" "put" "patch" "delete" "trace" }}
+    {{ $method }}:
       tags:
         - Authentication
       summary: Verification
@@ -409,6 +142,7 @@ paths:
           description: Unauthorized
       security:
         - authelia_auth: []
+    {{- end }}
   /api/firstfactor:
     post:
       tags:
@@ -477,6 +211,7 @@ paths:
                 $ref: '#/components/schemas/handlers.logoutResponseBody'
       security:
         - authelia_auth: []
+  {{- if .PasswordReset }}
   /api/reset-password/identity/start:
     post:
       tags:
@@ -494,7 +229,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/handlers.resetPasswordStep1RequestBody'
+              $ref: '#/components/schemas/handlers.PasswordResetStep1RequestBody'
       responses:
         "200":
           description: Successful Operation
@@ -546,7 +281,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/handlers.resetPasswordStep2RequestBody'
+              $ref: '#/components/schemas/handlers.PasswordResetStep2RequestBody'
       responses:
         "200":
           description: Successful Operation
@@ -556,6 +291,7 @@ paths:
                 $ref: '#/components/schemas/middlewares.OkResponse'
       security:
         - authelia_auth: []
+  {{- end }}
   /api/user/info:
     get:
       tags:
@@ -593,25 +329,6 @@ paths:
           description: Forbidden
       security:
         - authelia_auth: []
-  /api/user/info/totp:
-    get:
-      tags:
-        - User Information
-      summary: User TOTP Configuration
-      description: >
-        The user TOTP info endpoint provides information necessary to display the TOTP component to validate their
-        TOTP input such as the period/frequency and number of digits.
-      responses:
-        "200":
-          description: Successful Operation
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/handlers.UserInfoTOTP'
-        "403":
-          description: Forbidden
-      security:
-        - authelia_auth: []
   /api/user/info/2fa_method:
     post:
       tags:
@@ -634,6 +351,26 @@ paths:
           description: Forbidden
       security:
         - authelia_auth: []
+  {{- if .TOTP }}
+  /api/user/info/totp:
+    get:
+      tags:
+        - User Information
+      summary: User TOTP Configuration
+      description: >
+        The user TOTP info endpoint provides information necessary to display the TOTP component to validate their
+        TOTP input such as the period/frequency and number of digits.
+      responses:
+        "200":
+          description: Successful Operation
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/handlers.UserInfoTOTP'
+        "403":
+          description: Forbidden
+      security:
+        - authelia_auth: []
   /api/secondfactor/totp/identity/start:
     post:
       tags:
@@ -706,6 +443,8 @@ paths:
                 $ref: '#/components/schemas/middlewares.ErrorResponse'
       security:
         - authelia_auth: []
+  {{- end }}
+  {{- if .Webauthn }}
   /api/secondfactor/webauthn/assertion:
     get:
       tags:
@@ -851,6 +590,8 @@ paths:
         - authelia_auth: []
       parameters:
         - $ref: '#/components/parameters/deviceID'
+  {{- end }}
+  {{- if .Duo }}
   /api/secondfactor/duo:
     post:
       tags:
@@ -914,6 +655,8 @@ paths:
           description: Unauthorized
       security:
         - authelia_auth: []
+  {{- end }}
+  {{- if .OpenIDConnect }}
   /.well-known/openid-configuration:
     get:
       tags:
@@ -1428,6 +1171,7 @@ paths:
           description: Forbidden
       security:
         - authelia_auth: []
+  {{- end }}
 components:
   parameters:
     deviceID:
@@ -1655,7 +1399,8 @@ components:
             redirect:
               type: string
               example: https://home.example.com
-    handlers.resetPasswordStep1RequestBody:
+    {{- if .PasswordReset }}
+    handlers.PasswordResetStep1RequestBody:
       required:
         - username
       type: object
@@ -1663,7 +1408,7 @@ components:
         username:
           type: string
           example: john
-    handlers.resetPasswordStep2RequestBody:
+    handlers.PasswordResetStep2RequestBody:
       required:
         - password
       type: object
@@ -1671,6 +1416,8 @@ components:
         password:
           type: string
           example: password
+    {{- end }}
+    {{- if .Duo }}
     handlers.bodySignDuoRequest:
       type: object
       properties:
@@ -1687,23 +1434,7 @@ components:
           format: uuid
           pattern: '^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$'
           example: "3ebcfbc5-b0fd-4ee0-9d3c-080ae1e7298c"
-    handlers.bodySignTOTPRequest:
-      type: object
-      properties:
-        token:
-          type: string
-          example: "123456"
-        targetURL:
-          type: string
-          example: https://secure.example.com
-        workflow:
-          type: string
-          example: openid_connect
-        workflowID:
-          type: string
-          format: uuid
-          pattern: '^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$'
-          example: "3ebcfbc5-b0fd-4ee0-9d3c-080ae1e7298c"
+    {{- end }}
     handlers.StateResponse:
       type: object
       properties:
@@ -1722,7 +1453,24 @@ components:
             default_redirection_url:
               type: string
               example: https://home.example.com
-    handlers.TOTPKeyResponse:
+    middlewares.ErrorResponse:
+      type: object
+      properties:
+        status:
+          type: string
+          example: KO
+        message:
+          type: string
+          example: Authentication failed, please retry later.
+    middlewares.IdentityVerificationFinishBody:
+      required:
+        - token
+      type: object
+      properties:
+        token:
+          type: string
+          example: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2MDc5MjU1OTYsImlzcyI6IkF1dGhlbGlhIiwiYWN0aW9uIjoiUmVzZXRQYXNzd29yZCIsInVzZXJuYW1lIjoiQW1pciJ9.636yqRrUCGCe4jsMCsonleX5CYWHncYqZum-YYb6VaY
+    middlewares.OkResponse:
       type: object
       properties:
         status:
@@ -1730,13 +1478,6 @@ components:
           example: OK
         data:
           type: object
-          properties:
-            base32_secret:
-              type: string
-              example: 5ZH7Y5CTFWOXN7EOLGBMMXADRNQFHVUDZSYKCN5HMFAIRSLAWY3Q
-            otpauth_url:
-              type: string
-              example: otpauth://totp/auth.example.com:john?algorithm=SHA1&digits=6&issuer=auth.example.com&period=30&secret=5ZH7Y5CTFWOXN7EOLGBMMXADRNQFHVUDZSYKCN5HMFAIRSLAWY3Q
     handlers.UserInfo:
       type: object
       properties:
@@ -1765,6 +1506,19 @@ components:
             has_duo:
               type: boolean
               example: true
+    handlers.UserInfo.MethodBody:
+      required:
+        - method
+      type: object
+      properties:
+        method:
+          type: string
+          enum:
+            - "totp"
+            - "webauthn"
+            - "mobile_push"
+          example: totp
+    {{- if .TOTP }}
     handlers.UserInfoTOTP:
       type: object
       properties:
@@ -1784,36 +1538,24 @@ components:
               description: The number of digits defined in the users TOTP configuration
               type: integer
               example: 6
-    handlers.UserInfo.MethodBody:
-      required:
-        - method
-      type: object
-      properties:
-        method:
-          type: string
-          enum:
-            - "totp"
-            - "webauthn"
-            - "mobile_push"
-          example: totp
-    middlewares.ErrorResponse:
-      type: object
-      properties:
-        status:
-          type: string
-          example: KO
-        message:
-          type: string
-          example: Authentication failed, please retry later.
-    middlewares.IdentityVerificationFinishBody:
-      required:
-        - token
+    handlers.bodySignTOTPRequest:
       type: object
       properties:
         token:
           type: string
-          example: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2MDc5MjU1OTYsImlzcyI6IkF1dGhlbGlhIiwiYWN0aW9uIjoiUmVzZXRQYXNzd29yZCIsInVzZXJuYW1lIjoiQW1pciJ9.636yqRrUCGCe4jsMCsonleX5CYWHncYqZum-YYb6VaY
-    middlewares.OkResponse:
+          example: "123456"
+        targetURL:
+          type: string
+          example: https://secure.example.com
+        workflow:
+          type: string
+          example: openid_connect
+        workflowID:
+          type: string
+          format: uuid
+          pattern: '^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$'
+          example: "3ebcfbc5-b0fd-4ee0-9d3c-080ae1e7298c"
+    handlers.TOTPKeyResponse:
       type: object
       properties:
         status:
@@ -1821,6 +1563,15 @@ components:
           example: OK
         data:
           type: object
+          properties:
+            base32_secret:
+              type: string
+              example: 5ZH7Y5CTFWOXN7EOLGBMMXADRNQFHVUDZSYKCN5HMFAIRSLAWY3Q
+            otpauth_url:
+              type: string
+              example: otpauth://totp/auth.example.com:john?algorithm=SHA1&digits=6&issuer=auth.example.com&period=30&secret=5ZH7Y5CTFWOXN7EOLGBMMXADRNQFHVUDZSYKCN5HMFAIRSLAWY3Q
+    {{- end }}
+    {{- if .Webauthn }}
     webauthn.PublicKeyCredential:
       type: object
       properties:
@@ -2129,6 +1880,8 @@ components:
                 written:
                   type: boolean
                   example: false
+    {{- end }}
+    {{- if .OpenIDConnect }}
     openid.request.consent:
       type: object
       properties:
@@ -3725,12 +3478,15 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/jose.spec.JWK'
+  {{- end }}
   securitySchemes:
     authelia_auth:
       type: apiKey
       name: "{{ .Session }}"
       in: cookie
+    {{- if .OpenIDConnect }}
     openid:
       type: openIdConnect
       openIdConnectUrl: "{{ .BaseURL }}.well-known/openid-configuration"
+    {{- end }}
 ...
diff --git a/config.template.yml b/config.template.yml
index 7764dc4dc..6dc5a39eb 100644
--- a/config.template.yml
+++ b/config.template.yml
@@ -1394,15 +1394,9 @@ notifier:
         ## Sets the client to public. This should typically not be set, please see the documentation for usage.
         # public: false
 
-        ## The policy to require for this client; one_factor or two_factor.
-        # authorization_policy: two_factor
-
-        ## The consent mode controls how consent is obtained.
-        # consent_mode: auto
-
-        ## This value controls the duration a consent on this client remains remembered when the consent mode is
-        ## configured as 'auto' or 'pre-configured'.
-        # pre_configured_consent_duration: 1w
+        ## Redirect URI's specifies a list of valid case-sensitive callbacks for this client.
+        # redirect_uris:
+        # - https://oidc.example.com:8080/oauth2/callback
 
         ## Audience this client is allowed to request.
         # audience: []
@@ -1414,10 +1408,6 @@ notifier:
           # - email
           # - profile
 
-        ## Redirect URI's specifies a list of valid case-sensitive callbacks for this client.
-        # redirect_uris:
-        # - https://oidc.example.com:8080/oauth2/callback
-
         ## Grant Types configures which grants this client can obtain.
         ## It's not recommended to define this unless you know what you're doing.
         # grant_types:
@@ -1435,6 +1425,23 @@ notifier:
           # - query
           # - fragment
 
+        ## The policy to require for this client; one_factor or two_factor.
+        # authorization_policy: two_factor
+
+        ## Enforces the use of PKCE for this client when set to true.
+        # enforce_pkce: false
+
+        ## Enforces the use of PKCE for this client when configured, and enforces the specified challenge method.
+        ## Options are 'plain' and 'S256'.
+        # pkce_challenge_method: S256
+
         ## The algorithm used to sign userinfo endpoint responses for this client, either none or RS256.
         # userinfo_signing_algorithm: none
+
+        ## The consent mode controls how consent is obtained.
+        # consent_mode: auto
+
+        ## This value controls the duration a consent on this client remains remembered when the consent mode is
+        ## configured as 'auto' or 'pre-configured'.
+        # pre_configured_consent_duration: 1w
 ...
diff --git a/docs/content/en/configuration/identity-providers/open-id-connect.md b/docs/content/en/configuration/identity-providers/open-id-connect.md
index 2e0f78e55..462aabc70 100644
--- a/docs/content/en/configuration/identity-providers/open-id-connect.md
+++ b/docs/content/en/configuration/identity-providers/open-id-connect.md
@@ -404,12 +404,92 @@ useful for SPA's and CLI tools. This option requires setting the [client secret]
 In addition to the standard rules for redirect URIs, public clients can use the `urn:ietf:wg:oauth:2.0:oob` redirect
 URI.
 
+#### redirect_uris
+
+{{< confkey type="list(string)" required="yes" >}}
+
+A list of valid callback URIs this client will redirect to. All other callbacks will be considered unsafe. The URIs are
+case-sensitive and they differ from application to application - the community has provided
+[a list of URL´s for common applications](../../integration/openid-connect/introduction.md).
+
+Some restrictions that have been placed on clients and
+their redirect URIs are as follows:
+
+1. If a client attempts to authorize with Authelia and its redirect URI is not listed in the client configuration the
+   attempt to authorize will fail and an error will be generated.
+2. The redirect URIs are case-sensitive.
+3. The URI must include a scheme and that scheme must be one of `http` or `https`.
+4. The client can ignore rule 3 and use `urn:ietf:wg:oauth:2.0:oob` if it is a [public](#public) client type.
+
+#### audience
+
+{{< confkey type="list(string)" required="no" >}}
+
+A list of audiences this client is allowed to request.
+
+#### scopes
+
+{{< confkey type="list(string)" default="openid, groups, profile, email" required="no" >}}
+
+A list of scopes to allow this client to consume. See
+[scope definitions](../../integration/openid-connect/introduction.md#scope-definitions) for more information. The
+documentation for the application you want to use with Authelia will most-likely provide you with the scopes to allow.
+
+#### grant_types
+
+{{< confkey type="list(string)" default="refresh_token, authorization_code" required="no" >}}
+
+A list of grant types this client can return. *It is recommended that this isn't configured at this time unless you
+know what you're doing*. Valid options are: `implicit`, `refresh_token`, `authorization_code`, `password`,
+`client_credentials`.
+
+#### response_types
+
+{{< confkey type="list(string)" default="code" required="no" >}}
+
+A list of response types this client can return. *It is recommended that this isn't configured at this time unless you
+know what you're doing*. Valid options are: `code`, `code id_token`, `id_token`, `token id_token`, `token`,
+`token id_token code`.
+
+#### response_modes
+
+{{< confkey type="list(string)" default="form_post, query, fragment" required="no" >}}
+
+A list of response modes this client can return. It is recommended that this isn't configured at this time unless you
+know what you're doing. Potential values are `form_post`, `query`, and `fragment`.
+
 #### authorization_policy
 
 {{< confkey type="string" default="two_factor" required="no" >}}
 
 The authorization policy for this client: either `one_factor` or `two_factor`.
 
+#### enforce_pkce
+
+{{< confkey type="bool" default="false" required="no" >}}
+
+This setting enforces the use of [PKCE] for this individual client. To enforce it for all clients see the global
+[enforce_pkce](#enforcepkce) setting.
+
+#### pkce_challenge_method
+
+{{< confkey type="string" default="" required="no" >}}
+
+This setting enforces the use of the specified [PKCE] challenge method for this individual client. This setting also
+effectively enables the [enforce_pkce](#enforcepkce-1) option for this client.
+
+Valid values are an empty string, `plain`, or `S256`. It should be noted that `S256` is strongly recommended if the
+relying party supports it.
+
+#### userinfo_signing_algorithm
+
+{{< confkey type="string" default="none" required="no" >}}
+
+The algorithm used to sign the userinfo endpoint responses. This can either be `none` or `RS256`.
+
+See the [integration guide](../../integration/openid-connect/introduction.md#user-information-signing-algorithm) for
+more information.
+
 #### consent_mode
 
 {{< confkey type="string" default="auto" required="no" >}}
@@ -442,69 +522,6 @@ match exactly with the granted scopes/audience.
 
 [consent_mode]: #consentmode
 
-#### audience
-
-{{< confkey type="list(string)" required="no" >}}
-
-A list of audiences this client is allowed to request.
-
-#### scopes
-
-{{< confkey type="list(string)" default="openid, groups, profile, email" required="no" >}}
-
-A list of scopes to allow this client to consume. See
-[scope definitions](../../integration/openid-connect/introduction.md#scope-definitions) for more information. The
-documentation for the application you want to use with Authelia will most-likely provide you with the scopes to allow.
-
-#### redirect_uris
-
-{{< confkey type="list(string)" required="yes" >}}
-
-A list of valid callback URIs this client will redirect to. All other callbacks will be considered unsafe. The URIs are
-case-sensitive and they differ from application to application - the community has provided
-[a list of URL´s for common applications](../../integration/openid-connect/introduction.md).
-
-Some restrictions that have been placed on clients and
-their redirect URIs are as follows:
-
-1. If a client attempts to authorize with Authelia and its redirect URI is not listed in the client configuration the
-   attempt to authorize will fail and an error will be generated.
-2. The redirect URIs are case-sensitive.
-3. The URI must include a scheme and that scheme must be one of `http` or `https`.
-4. The client can ignore rule 3 and use `urn:ietf:wg:oauth:2.0:oob` if it is a [public](#public) client type.
-
-#### grant_types
-
-{{< confkey type="list(string)" default="refresh_token, authorization_code" required="no" >}}
-
-A list of grant types this client can return. *It is recommended that this isn't configured at this time unless you
-know what you're doing*. Valid options are: `implicit`, `refresh_token`, `authorization_code`, `password`,
-`client_credentials`.
-
-#### response_types
-
-{{< confkey type="list(string)" default="code" required="no" >}}
-
-A list of response types this client can return. *It is recommended that this isn't configured at this time unless you
-know what you're doing*. Valid options are: `code`, `code id_token`, `id_token`, `token id_token`, `token`,
-`token id_token code`.
-
-#### response_modes
-
-{{< confkey type="list(string)" default="form_post, query, fragment" required="no" >}}
-
-A list of response modes this client can return. It is recommended that this isn't configured at this time unless you
-know what you're doing. Potential values are `form_post`, `query`, and `fragment`.
-
-#### userinfo_signing_algorithm
-
-{{< confkey type="string" default="none" required="no" >}}
-
-The algorithm used to sign the userinfo endpoint responses. This can either be `none` or `RS256`.
-
-See the [integration guide](../../integration/openid-connect/introduction.md#user-information-signing-algorithm) for
-more information.
-
 ## Integration
 
 To integrate Authelia's [OpenID Connect] implementation with a relying party please see the
diff --git a/docs/content/en/integration/proxies/swag.md b/docs/content/en/integration/proxies/swag.md
index 2e49ce249..46d86060b 100644
--- a/docs/content/en/integration/proxies/swag.md
+++ b/docs/content/en/integration/proxies/swag.md
@@ -163,9 +163,9 @@ services:
 In the [SWAG] `/config` mount which is mounted to `${PWD}/data/swag` in our example:
 
 1. Create a folder named `snippets/authelia`:
-   - The `mkdir -p ${PWD}/data/swag/snippets/authelia` command should achieve this on Linux.
-2. Create the `${PWD}/data/swag/nginxsnippets/authelia/location.conf` file which can be found [here](nginx.md#authelia-locationconf).
-3. Create the `${PWD}/data/swag/nginxsnippets/authelia/authrequest.conf` file which can be found [here](nginx.md#authelia-authrequestconf).
+   - The `mkdir -p ${PWD}/data/swag/nginx/snippets/authelia` command should achieve this on Linux.
+2. Create the `${PWD}/data/swag/nginx/snippets/authelia/location.conf` file which can be found [here](nginx.md#authelia-locationconf).
+3. Create the `${PWD}/data/swag/nginx/snippets/authelia/authrequest.conf` file which can be found [here](nginx.md#authelia-authrequestconf).
    - Ensure you adjust the line `error_page 401 =302 https://auth.example.com/?rd=$target_url;` replacing `https://auth.example.com/` with your external Authelia URL.
 
 ## Protected Application
@@ -174,7 +174,7 @@ In the server configuration for the application you want to protect:
 
 1. Edit the `/config/nginx/proxy-confs/` file for the application you wish to protect.
 2. Under the `#include /config/nginx/authelia-server.conf;` line which should be within the `server` block
-   but not inside any `location` blocks add the following line: ``.
+   but not inside any `location` blocks add the following line: `include /config/nginx/snippets/authelia/location.conf;`.
 3. Under the `#include /config/nginx/authelia-location.conf;` line which should be within the applications
    `location` block add the following line `include /config/nginx/snippets/authelia/authrequest.conf;`.
 
diff --git a/docs/content/en/policies/versioning.md b/docs/content/en/policies/versioning.md
index 5853f35dd..a5de06833 100644
--- a/docs/content/en/policies/versioning.md
+++ b/docs/content/en/policies/versioning.md
@@ -10,14 +10,31 @@ aliases:
 ---
 
 The __Authelia__ team aims to abide by the [Semantic Versioning 2.0.0](https://semver.org/spec/v2.0.0.html) policy. This
-means that we use the format `major.minor.patch` for our version numbers, where a change to `major` denotes a breaking
-change which will likely require user interaction to upgrade, `minor` which denotes a new feature, and `patch` denotes a
-fix.
+means that we use the format `<major>.<minor>.<patch>` for our version numbers, where a change to `major` denotes a
+breaking change which will likely require user interaction to upgrade, `minor` which denotes a new feature, and `patch`
+denotes a fix.
 
 It is therefore recommended users do not automatically upgrade the `minor` version without reading the patch notes, and
 it's critically important users do not upgrade the `major` version without reading the patch notes. You should pin your
-version to `4.37` for example to prevent automatic upgrades from negatively affecting you.
+version to `4.37` for example to prevent automatic upgrades of the `minor` version, or pin your version to `4` to
+prevent automatic upgrade of the `major` version.
 
+We generally do not recommend automated upgrades of critical systems but instead recommend ensuring you are notified an
+upgrade exists.
+
+## Major Version Zero
+
+A major version of `v0.x.x` indicates as per the [Semantic Versioning 2.0.0](https://semver.org/spec/v2.0.0.html) policy
+that there may be breaking changes without warning. Some [components](#components) will be released under this version
+while they're in early development.
+
+## Components
+
+Several components may exist at various times. We aim to abide by this policy for all components related to Authelia.
+It is important to note that each component has its own version, for example the primary Authelia binary version may be
+v4.40.0 but another component such as the [Helm Chart](https://charts.authelia.com) version may be v0.9.0.
+
+This means that a breaking change may occur to one but not the other as these components do not share a version.
 ## Exceptions
 
 There are exceptions to this versioning policy.
@@ -33,7 +50,7 @@ Notable Advanced Customizations:
 - Templates:
   - Email
   - Content Security Policy header
-- Localization Assets
+- Localization / Internationalization Assets
 
 ### Breaking Changes
 
@@ -47,6 +64,6 @@ Notable examples:
 - OpenID Connect 1.0
 - File Filters
 
-The reasoning is as we develop these features there may be mistakes and we may need to make a change that should be
-considered breaking. As these features graduate from their status to generally available they will move into our
-standard versioning policy from this exception.
+The reasoning is as we develop these features there may be mistakes and we may need to make a change that would normally
+be considered a breaking change. As these features graduate from their status to generally available they will move into
+our standard versioning policy and lose their exception status.
diff --git a/docs/content/en/reference/guides/internationalization.md b/docs/content/en/reference/guides/internationalization.md
index eb204bee9..dadf6062c 100644
--- a/docs/content/en/reference/guides/internationalization.md
+++ b/docs/content/en/reference/guides/internationalization.md
@@ -15,3 +15,5 @@ toc: true
 ## Web Portal Internationalization
 
 {{% table-i18n-locales %}}
+
+Information about overriding the web portal internationalization is available from the [Server Asset Overrides Reference Guide](./server-asset-overrides.md).
diff --git a/docs/content/en/reference/guides/notification-templates.md b/docs/content/en/reference/guides/notification-templates.md
index 95a30e9e5..cfc078dd9 100644
--- a/docs/content/en/reference/guides/notification-templates.md
+++ b/docs/content/en/reference/guides/notification-templates.md
@@ -20,9 +20,9 @@ This guide effectively documents the usage of the
 
 ## Important Notes
 
-1. The templates are not covered by our stability guarantees. While we aim to avoid changes to the templates which
-   would cause users to have to manually change them changes may be necessary in order to facilitate bug fixes or
-   generally improve the templates.
+1. The templates are not covered by our stability guarantees as per our [Versioning Policy]. While we aim to avoid
+   changes to the templates which would cause users to have to manually change them changes may be necessary in order to
+   facilitate bug fixes or generally improve the templates.
    1. It is your responsibility to ensure your templates are up to date. We make no efforts in facilitating this.
 2. We may not be able to offer any direct support in debugging these templates. We only offer support and fixes to
    the official templates.
@@ -82,3 +82,4 @@ Several functions are implemented with the email templates. See the
 [server_name]: ../../configuration/notifications/smtp.md#tls
 [sender]: ../../configuration/notifications/smtp.md#sender
 [identifier]: ../../configuration/notifications/smtp.md#identifier
+[Versioning Policy]: ../../policies/versioning.md
diff --git a/docs/content/en/reference/guides/server-asset-overrides.md b/docs/content/en/reference/guides/server-asset-overrides.md
index 966401668..a593af76c 100644
--- a/docs/content/en/reference/guides/server-asset-overrides.md
+++ b/docs/content/en/reference/guides/server-asset-overrides.md
@@ -39,8 +39,8 @@ the language itself, or adding a variant form of that language. If you'd like su
 to make a PR. We also encourage people to make PR's for variants where the difference in the variants is significant.*
 
 *__Important Note__ Users wishing to override the locales files should be aware that we do not provide any guarantee
-that the file will not change in a breaking way between releases. Users who planning to utilize these
-overrides should either check for changes to the files in the
+that the file will not change in a breaking way between releases as per our [Versioning Policy]. Users who planning to
+utilize these overrides should either check for changes to the files in the
 [en](https://github.com/authelia/authelia/tree/master/internal/server/locales/en) translation prior to upgrading or
 [Contribute](../../contributing/prologue/translations.md) their translation to ensure it is maintained.*
 
@@ -72,12 +72,8 @@ Each file in a locale directory represents a translation namespace. The list of
 
 List of supported languages and variants:
 
-|      Description      | Language | Additional Variants |       Location       |
-|:---------------------:|:--------:|:-------------------:|:--------------------:|
-|        English        |    en    |         N/A         |  locales/en/*.json   |
-|        Spanish        |    es    |         N/A         |  locales/es/*.json   |
-|        German         |    de    |         N/A         |  locales/de/*.json   |
-|        French         |    fr    |         N/A         |  locales/fr/*.json   |
-|        Russian        |    ru    |         N/A         |  locales/ru/*.json   |
-|        Swedish        |    sv    |   sv-SE (Sweden)    |  locales/sv/*.json   |
-| Chinese (Traditional) |  zh-TW   |         N/A         | locales/zh-TW/*.json |
+{{% table-i18n-overrides %}}
+
+More information may be available from the [Internationalization Reference Guide](./internationalization.md).
+
+[Versioning Policy]: ../../policies/versioning.md
diff --git a/docs/content/en/reference/guides/templating.md b/docs/content/en/reference/guides/templating.md
index c95e9329d..b34cc090f 100644
--- a/docs/content/en/reference/guides/templating.md
+++ b/docs/content/en/reference/guides/templating.md
@@ -2,7 +2,7 @@
 title: "Templating"
 description: "A reference guide on the templates system"
 lead: "This section contains reference documentation for Authelia's templating capabilities."
-date: 2022-12-23T18:31:05+11:00
+date: 2022-12-23T21:58:54+11:00
 draft: false
 images: []
 menu:
@@ -56,6 +56,28 @@ The following functions which mimic the behaviour of helm exist in most templati
 - b64dec
 - b32enc
 - b32dec
+- list
+- dict
+- get
+- set
+- isAbs
+- base
+- dir
+- ext
+- clean
+- osBase
+- osClean
+- osDir
+- osExt
+- osIsAbs
+- deepEqual
+- typeOf
+- typeIs
+- typeIsLike
+- kindOf
+- kindIs
+- default
+- empty
 
 See the [Helm Documentation](https://helm.sh/docs/chart_template_guide/function_list/) for more information. Please
 note that only the functions listed above are supported and the functions don't necessarily behave exactly the same.
diff --git a/docs/content/en/roadmap/active/openid-connect.md b/docs/content/en/roadmap/active/openid-connect.md
index 08cff74f0..72a4785dc 100644
--- a/docs/content/en/roadmap/active/openid-connect.md
+++ b/docs/content/en/roadmap/active/openid-connect.md
@@ -64,7 +64,7 @@ Feature List:
 
 Feature List:
 
-* [Proof Key Code Exchange (PKCE)](https://www.rfc-editor.org/rfc/rfc7636.html) for Authorization Code Flow
+* [Proof Key Code Exchange (PKCE)] for Authorization Code Flow
 * Claims:
   * `preferred_username` - sending the username in this claim instead of the `sub` claim.
 
@@ -115,8 +115,8 @@ Feature List:
 
 {{< roadmap-status stage="in-progress" version="v4.38.0" >}}
 
-
 * [OAuth 2.0 Pushed Authorization Requests](https://www.rfc-editor.org/rfc/rfc9126.html)
+* Per-Client [Proof Key Code Exchange (PKCE)] Policy
 
 ### Beta 7
 
@@ -219,3 +219,4 @@ The `preferred_username` claim was missing and was fixed.
 [OpenID Connect Core (Subject Identifier Types)]: https://openid.net/specs/openid-connect-core-1_0.html#SubjectIDTypes
 [OpenID Connect Core (Pairwise Identifier Algorithm)]: https://openid.net/specs/openid-connect-core-1_0.html#PairwiseAlg
 [OpenID Connect Core (Mandatory to Implement Features for All OpenID Providers)]: https://openid.net/specs/openid-connect-core-1_0.html#ServerMTI
+[Proof Key Code Exchange (PKCE)]: https://www.rfc-editor.org/rfc/rfc7636.html
diff --git a/docs/layouts/shortcodes/table-i18n-overrides.html b/docs/layouts/shortcodes/table-i18n-overrides.html
new file mode 100644
index 000000000..6b5c37ec8
--- /dev/null
+++ b/docs/layouts/shortcodes/table-i18n-overrides.html
@@ -0,0 +1,5 @@
+|    Language    |    Locale     |        Override Path         |
+|:--------------:|:-------------:|:----------------------------:|
+{{- range $.Site.Data.languages.languages }}
+| {{ .display }} | {{ .locale }} | locales/{{ .locale }}/*.json |
+{{- end }}
diff --git a/docs/package.json b/docs/package.json
index 94b231d21..371ee9e01 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -47,9 +47,9 @@
     "auto-changelog": "2.4.0",
     "autoprefixer": "10.4.13",
     "bootstrap": "5.2.3",
-    "bootstrap-icons": "1.10.2",
+    "bootstrap-icons": "1.10.3",
     "clipboard": "2.0.11",
-    "eslint": "8.30.0",
+    "eslint": "8.31.0",
     "exec-bin": "1.0.0",
     "flexsearch": "0.7.31",
     "highlight.js": "11.7.0",
@@ -57,14 +57,14 @@
     "instant.page": "5.1.1",
     "katex": "0.16.4",
     "lazysizes": "5.3.2",
-    "markdownlint-cli2": "0.5.1",
+    "markdownlint-cli2": "0.6.0",
     "netlify-plugin-submit-sitemap": "0.4.0",
     "node-fetch": "3.3.0",
     "postcss": "8.4.20",
     "postcss-cli": "10.1.0",
     "purgecss-whitelister": "2.4.0",
     "shx": "0.3.4",
-    "stylelint": "14.16.0",
+    "stylelint": "14.16.1",
     "stylelint-config-standard-scss": "6.1.0"
   },
   "otherDependencies": {
diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml
index 4e7d0e55a..eaf5ad761 100644
--- a/docs/pnpm-lock.yaml
+++ b/docs/pnpm-lock.yaml
@@ -10,9 +10,9 @@ specifiers:
   auto-changelog: 2.4.0
   autoprefixer: 10.4.13
   bootstrap: 5.2.3
-  bootstrap-icons: 1.10.2
+  bootstrap-icons: 1.10.3
   clipboard: 2.0.11
-  eslint: 8.30.0
+  eslint: 8.31.0
   exec-bin: 1.0.0
   flexsearch: 0.7.31
   highlight.js: 11.7.0
@@ -20,14 +20,14 @@ specifiers:
   instant.page: 5.1.1
   katex: 0.16.4
   lazysizes: 5.3.2
-  markdownlint-cli2: 0.5.1
+  markdownlint-cli2: 0.6.0
   netlify-plugin-submit-sitemap: 0.4.0
   node-fetch: 3.3.0
   postcss: 8.4.20
   postcss-cli: 10.1.0
   purgecss-whitelister: 2.4.0
   shx: 0.3.4
-  stylelint: 14.16.0
+  stylelint: 14.16.1
   stylelint-config-standard-scss: 6.1.0
 
 devDependencies:
@@ -40,9 +40,9 @@ devDependencies:
   auto-changelog: 2.4.0
   autoprefixer: 10.4.13_postcss@8.4.20
   bootstrap: 5.2.3_@popperjs+core@2.11.6
-  bootstrap-icons: 1.10.2
+  bootstrap-icons: 1.10.3
   clipboard: 2.0.11
-  eslint: 8.30.0
+  eslint: 8.31.0
   exec-bin: 1.0.0
   flexsearch: 0.7.31
   highlight.js: 11.7.0
@@ -50,15 +50,15 @@ devDependencies:
   instant.page: 5.1.1
   katex: 0.16.4
   lazysizes: 5.3.2
-  markdownlint-cli2: 0.5.1
+  markdownlint-cli2: 0.6.0
   netlify-plugin-submit-sitemap: 0.4.0
   node-fetch: 3.3.0
   postcss: 8.4.20
   postcss-cli: 10.1.0_postcss@8.4.20
   purgecss-whitelister: 2.4.0
   shx: 0.3.4
-  stylelint: 14.16.0
-  stylelint-config-standard-scss: 6.1.0_l3s4qeu3gkar2knsdy3w5miimm
+  stylelint: 14.16.1
+  stylelint-config-standard-scss: 6.1.0_vitr26fcqo6sphdfxyxll4n2gy
 
 packages:
 
@@ -1331,8 +1331,8 @@ packages:
       postcss-selector-parser: 6.0.11
     dev: true
 
-  /@eslint/eslintrc/1.4.0:
-    resolution: {integrity: sha512-7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A==}
+  /@eslint/eslintrc/1.4.1:
+    resolution: {integrity: sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       ajv: 6.12.6
@@ -1683,8 +1683,8 @@ packages:
       safe-buffer: 5.2.1
     dev: true
 
-  /bootstrap-icons/1.10.2:
-    resolution: {integrity: sha512-PTPYadRn1AMGr+QTSxe4ZCc+Wzv9DGZxbi3lNse/dajqV31n2/wl/7NX78ZpkvFgRNmH4ogdIQPQmxAfhEV6nA==}
+  /bootstrap-icons/1.10.3:
+    resolution: {integrity: sha512-7Qvj0j0idEm/DdX9Q0CpxAnJYqBCFCiUI6qzSPYfERMcokVuV9Mdm/AJiVZI8+Gawe4h/l6zFcOzvV7oXCZArw==}
     dev: true
 
   /bootstrap/5.2.3_@popperjs+core@2.11.6:
@@ -2073,7 +2073,7 @@ packages:
     resolution: {integrity: sha512-tQbV/4u5WVB8HMJr08pgw0b6nG4RGt/tj+7Numvq+zqcvUFeMaIWWOUFltiU+6go8BSO2/ogsB4EasDaj0y68Q==}
     engines: {node: '>=14.16'}
     dependencies:
-      globby: 13.1.2
+      globby: 13.1.3
       graceful-fs: 4.2.10
       is-glob: 4.0.3
       is-path-cwd: 3.0.0
@@ -2159,13 +2159,13 @@ packages:
       estraverse: 5.3.0
     dev: true
 
-  /eslint-utils/3.0.0_eslint@8.30.0:
+  /eslint-utils/3.0.0_eslint@8.31.0:
     resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
     engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
     peerDependencies:
       eslint: '>=5'
     dependencies:
-      eslint: 8.30.0
+      eslint: 8.31.0
       eslint-visitor-keys: 2.1.0
     dev: true
 
@@ -2179,12 +2179,12 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /eslint/8.30.0:
-    resolution: {integrity: sha512-MGADB39QqYuzEGov+F/qb18r4i7DohCDOfatHaxI2iGlPuC65bwG2gxgO+7DkyL38dRFaRH7RaRAgU6JKL9rMQ==}
+  /eslint/8.31.0:
+    resolution: {integrity: sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     hasBin: true
     dependencies:
-      '@eslint/eslintrc': 1.4.0
+      '@eslint/eslintrc': 1.4.1
       '@humanwhocodes/config-array': 0.11.8
       '@humanwhocodes/module-importer': 1.0.1
       '@nodelib/fs.walk': 1.2.8
@@ -2195,7 +2195,7 @@ packages:
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.1.1
-      eslint-utils: 3.0.0_eslint@8.30.0
+      eslint-utils: 3.0.0_eslint@8.31.0
       eslint-visitor-keys: 3.3.0
       espree: 9.4.0
       esquery: 1.4.0
@@ -2553,6 +2553,17 @@ packages:
       slash: 4.0.0
     dev: true
 
+  /globby/13.1.3:
+    resolution: {integrity: sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dependencies:
+      dir-glob: 3.0.1
+      fast-glob: 3.2.12
+      ignore: 5.2.1
+      merge2: 1.4.1
+      slash: 4.0.0
+    dev: true
+
   /globjoin/0.1.4:
     resolution: {integrity: sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==}
     dev: true
@@ -3037,30 +3048,30 @@ packages:
       uc.micro: 1.0.6
     dev: true
 
-  /markdownlint-cli2-formatter-default/0.0.3_markdownlint-cli2@0.5.1:
+  /markdownlint-cli2-formatter-default/0.0.3_markdownlint-cli2@0.6.0:
     resolution: {integrity: sha512-QEAJitT5eqX1SNboOD+SO/LNBpu4P4je8JlR02ug2cLQAqmIhh8IJnSK7AcaHBHhNADqdGydnPpQOpsNcEEqCw==}
     peerDependencies:
       markdownlint-cli2: '>=0.0.4'
     dependencies:
-      markdownlint-cli2: 0.5.1
+      markdownlint-cli2: 0.6.0
     dev: true
 
-  /markdownlint-cli2/0.5.1:
-    resolution: {integrity: sha512-f3Nb1GF/c8YSrV/FntsCWzpa5mLFJRlO+wzEgv+lkNQjU6MZflUwc2FbyEDPTo6oVhP2VyUOkK0GkFgfuktl1w==}
-    engines: {node: '>=14'}
+  /markdownlint-cli2/0.6.0:
+    resolution: {integrity: sha512-Bv20r6WGdcHMWi8QvAFZ3CBunf4i4aYmVdTfpAvXODI/1k3f09DZZ0i0LcX9ZMhlVxjoOzbVDz1NWyKc5hwTqg==}
+    engines: {node: '>=14.18.0'}
     hasBin: true
     dependencies:
-      globby: 13.1.2
-      markdownlint: 0.26.2
-      markdownlint-cli2-formatter-default: 0.0.3_markdownlint-cli2@0.5.1
+      globby: 13.1.3
+      markdownlint: 0.27.0
+      markdownlint-cli2-formatter-default: 0.0.3_markdownlint-cli2@0.6.0
       micromatch: 4.0.5
       strip-json-comments: 5.0.0
-      yaml: 2.1.1
+      yaml: 2.2.1
     dev: true
 
-  /markdownlint/0.26.2:
-    resolution: {integrity: sha512-2Am42YX2Ex5SQhRq35HxYWDfz1NLEOZWWN25nqd2h3AHRKsGRE+Qg1gt1++exW792eXTrR4jCNHfShfWk9Nz8w==}
-    engines: {node: '>=14'}
+  /markdownlint/0.27.0:
+    resolution: {integrity: sha512-HtfVr/hzJJmE0C198F99JLaeada+646B5SaG2pVoEakLFI6iRGsvMqrnnrflq8hm1zQgwskEgqSnhDW11JBp0w==}
+    engines: {node: '>=14.18.0'}
     dependencies:
       markdown-it: 13.0.1
     dev: true
@@ -3431,7 +3442,7 @@ packages:
     dependencies:
       lilconfig: 2.0.5
       postcss: 8.4.20
-      yaml: 2.1.1
+      yaml: 2.2.1
     dev: true
 
   /postcss-media-query-parser/0.2.3:
@@ -3928,7 +3939,7 @@ packages:
     resolution: {integrity: sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==}
     dev: true
 
-  /stylelint-config-recommended-scss/8.0.0_l3s4qeu3gkar2knsdy3w5miimm:
+  /stylelint-config-recommended-scss/8.0.0_vitr26fcqo6sphdfxyxll4n2gy:
     resolution: {integrity: sha512-BxjxEzRaZoQb7Iinc3p92GS6zRdRAkIuEu2ZFLTxJK2e1AIcCb5B5MXY9KOXdGTnYFZ+KKx6R4Fv9zU6CtMYPQ==}
     peerDependencies:
       postcss: ^8.3.3
@@ -3939,20 +3950,20 @@ packages:
     dependencies:
       postcss: 8.4.20
       postcss-scss: 4.0.4_postcss@8.4.20
-      stylelint: 14.16.0
-      stylelint-config-recommended: 9.0.0_stylelint@14.16.0
-      stylelint-scss: 4.2.0_stylelint@14.16.0
+      stylelint: 14.16.1
+      stylelint-config-recommended: 9.0.0_stylelint@14.16.1
+      stylelint-scss: 4.2.0_stylelint@14.16.1
     dev: true
 
-  /stylelint-config-recommended/9.0.0_stylelint@14.16.0:
+  /stylelint-config-recommended/9.0.0_stylelint@14.16.1:
     resolution: {integrity: sha512-9YQSrJq4NvvRuTbzDsWX3rrFOzOlYBmZP+o513BJN/yfEmGSr0AxdvrWs0P/ilSpVV/wisamAHu5XSk8Rcf4CQ==}
     peerDependencies:
       stylelint: ^14.10.0
     dependencies:
-      stylelint: 14.16.0
+      stylelint: 14.16.1
     dev: true
 
-  /stylelint-config-standard-scss/6.1.0_l3s4qeu3gkar2knsdy3w5miimm:
+  /stylelint-config-standard-scss/6.1.0_vitr26fcqo6sphdfxyxll4n2gy:
     resolution: {integrity: sha512-iZ2B5kQT2G3rUzx+437cEpdcnFOQkwnwqXuY8Z0QUwIHQVE8mnYChGAquyKFUKZRZ0pRnrciARlPaR1RBtPb0Q==}
     peerDependencies:
       postcss: ^8.3.3
@@ -3962,21 +3973,21 @@ packages:
         optional: true
     dependencies:
       postcss: 8.4.20
-      stylelint: 14.16.0
-      stylelint-config-recommended-scss: 8.0.0_l3s4qeu3gkar2knsdy3w5miimm
-      stylelint-config-standard: 29.0.0_stylelint@14.16.0
+      stylelint: 14.16.1
+      stylelint-config-recommended-scss: 8.0.0_vitr26fcqo6sphdfxyxll4n2gy
+      stylelint-config-standard: 29.0.0_stylelint@14.16.1
     dev: true
 
-  /stylelint-config-standard/29.0.0_stylelint@14.16.0:
+  /stylelint-config-standard/29.0.0_stylelint@14.16.1:
     resolution: {integrity: sha512-uy8tZLbfq6ZrXy4JKu3W+7lYLgRQBxYTUUB88vPgQ+ZzAxdrvcaSUW9hOMNLYBnwH+9Kkj19M2DHdZ4gKwI7tg==}
     peerDependencies:
       stylelint: ^14.14.0
     dependencies:
-      stylelint: 14.16.0
-      stylelint-config-recommended: 9.0.0_stylelint@14.16.0
+      stylelint: 14.16.1
+      stylelint-config-recommended: 9.0.0_stylelint@14.16.1
     dev: true
 
-  /stylelint-scss/4.2.0_stylelint@14.16.0:
+  /stylelint-scss/4.2.0_stylelint@14.16.1:
     resolution: {integrity: sha512-HHHMVKJJ5RM9pPIbgJ/XA67h9H0407G68Rm69H4fzFbFkyDMcTV1Byep3qdze5+fJ3c0U7mJrbj6S0Fg072uZA==}
     peerDependencies:
       stylelint: ^14.5.1
@@ -3986,11 +3997,11 @@ packages:
       postcss-resolve-nested-selector: 0.1.1
       postcss-selector-parser: 6.0.11
       postcss-value-parser: 4.2.0
-      stylelint: 14.16.0
+      stylelint: 14.16.1
     dev: true
 
-  /stylelint/14.16.0:
-    resolution: {integrity: sha512-X6uTi9DcxjzLV8ZUAjit1vsRtSwcls0nl07c9rqOPzvpA8IvTX/xWEkBRowS0ffevRrqkHa/ThDEu86u73FQDg==}
+  /stylelint/14.16.1:
+    resolution: {integrity: sha512-ErlzR/T3hhbV+a925/gbfc3f3Fep9/bnspMiJPorfGEmcBbXdS+oo6LrVtoUZ/w9fqD6o6k7PtUlCOsCRdjX/A==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     hasBin: true
     dependencies:
@@ -4339,8 +4350,8 @@ packages:
     engines: {node: '>= 6'}
     dev: true
 
-  /yaml/2.1.1:
-    resolution: {integrity: sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==}
+  /yaml/2.2.1:
+    resolution: {integrity: sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw==}
     engines: {node: '>= 14'}
     dev: true
 
diff --git a/docs/static/images/logos/caddy.png b/docs/static/images/logos/caddy.png
index d0d33ccf1..80b4764fb 100644
Binary files a/docs/static/images/logos/caddy.png and b/docs/static/images/logos/caddy.png differ
diff --git a/docs/static/images/logos/envoy.png b/docs/static/images/logos/envoy.png
index 16017014c..736528466 100644
Binary files a/docs/static/images/logos/envoy.png and b/docs/static/images/logos/envoy.png differ
diff --git a/go.mod b/go.mod
index 42a5ef230..390edcd5b 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.19
 require (
 	github.com/Gurpartap/logrus-stack v0.0.0-20170710170904-89c00d8a28f4
 	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
-	github.com/deckarep/golang-set v1.8.0
+	github.com/deckarep/golang-set/v2 v2.1.0
 	github.com/duosecurity/duo_api_golang v0.0.0-20221117185402-091daa09e19d
 	github.com/fasthttp/router v1.4.14
 	github.com/fasthttp/session/v2 v2.4.13
@@ -19,16 +19,16 @@ require (
 	github.com/golang-jwt/jwt/v4 v4.4.3
 	github.com/golang/mock v1.6.0
 	github.com/google/uuid v1.3.0
-	github.com/hashicorp/go-retryablehttp v0.7.1
+	github.com/hashicorp/go-retryablehttp v0.7.2
 	github.com/jackc/pgx/v5 v5.2.0
 	github.com/jmoiron/sqlx v1.3.5
-	github.com/knadh/koanf v1.4.4
+	github.com/knadh/koanf v1.4.5
 	github.com/mattn/go-sqlite3 v1.14.16
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
 	github.com/ory/fosite v0.44.0
 	github.com/ory/herodot v0.9.13
-	github.com/ory/x v0.0.523
+	github.com/ory/x v0.0.528
 	github.com/otiai10/copy v1.9.0
 	github.com/pkg/errors v0.9.1
 	github.com/pquerna/otp v1.4.0
@@ -39,11 +39,10 @@ require (
 	github.com/stretchr/testify v1.8.1
 	github.com/trustelem/zxcvbn v1.0.1
 	github.com/valyala/fasthttp v1.43.0
-	github.com/wneessen/go-mail v0.3.6
-	golang.org/x/net v0.4.0
+	github.com/wneessen/go-mail v0.3.7
 	golang.org/x/sync v0.1.0
-	golang.org/x/term v0.3.0
-	golang.org/x/text v0.5.0
+	golang.org/x/term v0.4.0
+	golang.org/x/text v0.6.0
 	gopkg.in/square/go-jose.v2 v2.6.0
 	gopkg.in/yaml.v3 v3.0.1
 )
@@ -110,8 +109,9 @@ require (
 	github.com/ysmood/leakless v0.8.0 // indirect
 	golang.org/x/crypto v0.1.0 // indirect
 	golang.org/x/mod v0.6.0 // indirect
+	golang.org/x/net v0.5.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
-	golang.org/x/sys v0.3.0 // indirect
+	golang.org/x/sys v0.4.0 // indirect
 	golang.org/x/tools v0.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71 // indirect
diff --git a/go.sum b/go.sum
index 957c4881c..42f9deb28 100644
--- a/go.sum
+++ b/go.sum
@@ -113,8 +113,8 @@ github.com/dave/jennifer v1.6.0/go.mod h1:AxTG893FiZKqxy3FP1kL80VMshSMuz2G+Egvsz
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4=
-github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo=
+github.com/deckarep/golang-set/v2 v2.1.0 h1:g47V4Or+DUdzbs8FxCCmgb6VYd+ptPAngjM6dtGktsI=
+github.com/deckarep/golang-set/v2 v2.1.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4=
 github.com/dgraph-io/ristretto v0.0.1/go.mod h1:T40EBc7CJke8TkpiYfGGKAeFjSaxuFXhuXRyumBd6RE=
 github.com/dgraph-io/ristretto v0.0.2/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E=
 github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8=
@@ -305,8 +305,8 @@ github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHh
 github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
 github.com/hashicorp/go-plugin v1.0.1/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY=
 github.com/hashicorp/go-retryablehttp v0.5.4/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
-github.com/hashicorp/go-retryablehttp v0.7.1 h1:sUiuQAnLlbvmExtFQs72iFW/HXeUn8Z1aJLQ4LJJbTQ=
-github.com/hashicorp/go-retryablehttp v0.7.1/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
+github.com/hashicorp/go-retryablehttp v0.7.2 h1:AcYqCvkpalPnPF2pn0KamgwamS42TqUDDYFRKq/RAd0=
+github.com/hashicorp/go-retryablehttp v0.7.2/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8=
 github.com/hashicorp/go-rootcerts v1.0.1/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
 github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
 github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
@@ -366,8 +366,8 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
 github.com/klauspost/compress v1.15.0/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY=
 github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
-github.com/knadh/koanf v1.4.4 h1:d2jY5nCCeoaiqvEKSBW9rEc93EfNy/XWgWsSB3j7JEA=
-github.com/knadh/koanf v1.4.4/go.mod h1:Hgyjp4y8v44hpZtPzs7JZfRAW5AhN7KfZcwv1RYggDs=
+github.com/knadh/koanf v1.4.5 h1:yKWFswTrqFc0u7jBAoERUz30+N1b1yPXU01gAPr8IrY=
+github.com/knadh/koanf v1.4.5/go.mod h1:Hgyjp4y8v44hpZtPzs7JZfRAW5AhN7KfZcwv1RYggDs=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
@@ -461,8 +461,8 @@ github.com/ory/herodot v0.9.13 h1:cN/Z4eOkErl/9W7hDIDLb79IO/bfsH+8yscBjRpB4IU=
 github.com/ory/herodot v0.9.13/go.mod h1:IWDs9kSvFQqw/cQ8zi5ksyYvITiUU4dI7glUrhZcJYo=
 github.com/ory/viper v1.7.5 h1:+xVdq7SU3e1vNaCsk/ixsfxE4zylk1TJUiJrY647jUE=
 github.com/ory/viper v1.7.5/go.mod h1:ypOuyJmEUb3oENywQZRgeAMwqgOyDqwboO1tj3DjTaM=
-github.com/ory/x v0.0.523 h1:vn8e+8tV3RqD8RlvoE6lLPUnjpjua1ExJDMFy3Z5TAQ=
-github.com/ory/x v0.0.523/go.mod h1:ayJio5x/fK4RwTgfgzs3JetOaaOSxso9hQjc3mFY8z0=
+github.com/ory/x v0.0.528 h1:26fXxJ5Zl5XDFjiCt5jdWQOI89Q2XogB1EnUeqx7P+M=
+github.com/ory/x v0.0.528/go.mod h1:XBqhPZRppPHTxtsE0l0oI/B2Onf1QJtMRGPh3CpEpA0=
 github.com/otiai10/copy v1.9.0 h1:7KFNiCgZ91Ru4qW4CWPf/7jqtxLagGRmIxWldPP9VY4=
 github.com/otiai10/copy v1.9.0/go.mod h1:hsfX19wcn0UWIHUQ3/4fHuehhk2UyArQ9dVFAn3FczI=
 github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE=
@@ -609,8 +609,8 @@ github.com/valyala/fasthttp v1.42.0/go.mod h1:f6VbjjoI3z1NDOZOv17o6RvtRSWxC77seB
 github.com/valyala/fasthttp v1.43.0 h1:Gy4sb32C98fbzVWZlTM1oTMdLWGyvxR03VhM6cBIU4g=
 github.com/valyala/fasthttp v1.43.0/go.mod h1:f6VbjjoI3z1NDOZOv17o6RvtRSWxC77seBFc2uWtgiY=
 github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
-github.com/wneessen/go-mail v0.3.6 h1:hT8PMIBdcTkoiDwoUGJssPYOe1Gg1/cUcp2o9+ls63o=
-github.com/wneessen/go-mail v0.3.6/go.mod h1:m25lkU2GYQnlVr6tdwK533/UXxo57V0kLOjaFYmub0E=
+github.com/wneessen/go-mail v0.3.7 h1:loEAGLvsDZLSiE6c+keBfg0gpias/R3ocFU8Eoh3Pq4=
+github.com/wneessen/go-mail v0.3.7/go.mod h1:m25lkU2GYQnlVr6tdwK533/UXxo57V0kLOjaFYmub0E=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
@@ -747,8 +747,8 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220906165146-f3363e06e74c/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
-golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
-golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
+golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
+golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -849,12 +849,12 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
-golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
+golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI=
-golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
+golang.org/x/term v0.4.0 h1:O7UWfv5+A2qiuulQk30kVinPoMtoIPeVaKLEgLpVkvg=
+golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -865,8 +865,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
-golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
+golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
diff --git a/internal/commands/context.go b/internal/commands/context.go
index 737ab9ce0..a0f2df2b2 100644
--- a/internal/commands/context.go
+++ b/internal/commands/context.go
@@ -1,6 +1,7 @@
 package commands
 
 import (
+	"context"
 	"crypto/x509"
 	"fmt"
 	"os"
@@ -8,7 +9,6 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"golang.org/x/net/context"
 	"golang.org/x/sync/errgroup"
 
 	"github.com/authelia/authelia/v4/internal/authentication"
@@ -22,6 +22,7 @@ import (
 	"github.com/authelia/authelia/v4/internal/notification"
 	"github.com/authelia/authelia/v4/internal/ntp"
 	"github.com/authelia/authelia/v4/internal/oidc"
+	"github.com/authelia/authelia/v4/internal/random"
 	"github.com/authelia/authelia/v4/internal/regulation"
 	"github.com/authelia/authelia/v4/internal/session"
 	"github.com/authelia/authelia/v4/internal/storage"
@@ -43,7 +44,10 @@ func NewCmdCtx() *CmdCtx {
 		cancel:  cancel,
 		group:   group,
 		log:     logging.Logger(),
-		config:  &schema.Configuration{},
+		providers: middlewares.Providers{
+			Random: &random.Cryptographical{},
+		},
+		config: &schema.Configuration{},
 	}
 }
 
@@ -139,48 +143,43 @@ func (ctx *CmdCtx) LoadProviders() (warns, errs []error) {
 		return warns, errs
 	}
 
-	storage := getStorageProvider(ctx)
+	ctx.providers.StorageProvider = getStorageProvider(ctx)
 
-	providers := middlewares.Providers{
-		Authorizer:      authorization.NewAuthorizer(ctx.config),
-		NTP:             ntp.NewProvider(&ctx.config.NTP),
-		PasswordPolicy:  middlewares.NewPasswordPolicyProvider(ctx.config.PasswordPolicy),
-		Regulator:       regulation.NewRegulator(ctx.config.Regulation, storage, utils.RealClock{}),
-		SessionProvider: session.NewProvider(ctx.config.Session, ctx.trusted),
-		StorageProvider: storage,
-		TOTP:            totp.NewTimeBasedProvider(ctx.config.TOTP),
-	}
+	ctx.providers.Authorizer = authorization.NewAuthorizer(ctx.config)
+	ctx.providers.NTP = ntp.NewProvider(&ctx.config.NTP)
+	ctx.providers.PasswordPolicy = middlewares.NewPasswordPolicyProvider(ctx.config.PasswordPolicy)
+	ctx.providers.Regulator = regulation.NewRegulator(ctx.config.Regulation, ctx.providers.StorageProvider, utils.RealClock{})
+	ctx.providers.SessionProvider = session.NewProvider(ctx.config.Session, ctx.trusted)
+	ctx.providers.TOTP = totp.NewTimeBasedProvider(ctx.config.TOTP)
 
 	var err error
 
 	switch {
 	case ctx.config.AuthenticationBackend.File != nil:
-		providers.UserProvider = authentication.NewFileUserProvider(ctx.config.AuthenticationBackend.File)
+		ctx.providers.UserProvider = authentication.NewFileUserProvider(ctx.config.AuthenticationBackend.File)
 	case ctx.config.AuthenticationBackend.LDAP != nil:
-		providers.UserProvider = authentication.NewLDAPUserProvider(ctx.config.AuthenticationBackend, ctx.trusted)
+		ctx.providers.UserProvider = authentication.NewLDAPUserProvider(ctx.config.AuthenticationBackend, ctx.trusted)
 	}
 
-	if providers.Templates, err = templates.New(templates.Config{EmailTemplatesPath: ctx.config.Notifier.TemplatePath}); err != nil {
+	if ctx.providers.Templates, err = templates.New(templates.Config{EmailTemplatesPath: ctx.config.Notifier.TemplatePath}); err != nil {
 		errs = append(errs, err)
 	}
 
 	switch {
 	case ctx.config.Notifier.SMTP != nil:
-		providers.Notifier = notification.NewSMTPNotifier(ctx.config.Notifier.SMTP, ctx.trusted)
+		ctx.providers.Notifier = notification.NewSMTPNotifier(ctx.config.Notifier.SMTP, ctx.trusted)
 	case ctx.config.Notifier.FileSystem != nil:
-		providers.Notifier = notification.NewFileNotifier(*ctx.config.Notifier.FileSystem)
+		ctx.providers.Notifier = notification.NewFileNotifier(*ctx.config.Notifier.FileSystem)
 	}
 
-	if providers.OpenIDConnect, err = oidc.NewOpenIDConnectProvider(ctx.config.IdentityProviders.OIDC, storage); err != nil {
+	if ctx.providers.OpenIDConnect, err = oidc.NewOpenIDConnectProvider(ctx.config.IdentityProviders.OIDC, ctx.providers.StorageProvider); err != nil {
 		errs = append(errs, err)
 	}
 
 	if ctx.config.Telemetry.Metrics.Enabled {
-		providers.Metrics = metrics.NewPrometheus()
+		ctx.providers.Metrics = metrics.NewPrometheus()
 	}
 
-	ctx.providers = providers
-
 	return warns, errs
 }
 
diff --git a/internal/commands/crypto.go b/internal/commands/crypto.go
index 6cad8f23f..74c8d4099 100644
--- a/internal/commands/crypto.go
+++ b/internal/commands/crypto.go
@@ -3,7 +3,6 @@ package commands
 import (
 	"crypto/ecdsa"
 	"crypto/ed25519"
-	"crypto/rand"
 	"crypto/rsa"
 	"crypto/x509"
 	"fmt"
@@ -262,7 +261,7 @@ func (ctx *CmdCtx) CryptoGenerateRunE(cmd *cobra.Command, args []string) (err er
 		privateKey any
 	)
 
-	if privateKey, err = cryptoGenPrivateKeyFromCmd(cmd); err != nil {
+	if privateKey, err = ctx.cryptoGenPrivateKeyFromCmd(cmd); err != nil {
 		return err
 	}
 
@@ -279,7 +278,7 @@ func (ctx *CmdCtx) CryptoCertificateRequestRunE(cmd *cobra.Command, _ []string)
 		privateKey any
 	)
 
-	if privateKey, err = cryptoGenPrivateKeyFromCmd(cmd); err != nil {
+	if privateKey, err = ctx.cryptoGenPrivateKeyFromCmd(cmd); err != nil {
 		return err
 	}
 
@@ -326,7 +325,7 @@ func (ctx *CmdCtx) CryptoCertificateRequestRunE(cmd *cobra.Command, _ []string)
 
 	b.Reset()
 
-	if csr, err = x509.CreateCertificateRequest(rand.Reader, template, privateKey); err != nil {
+	if csr, err = x509.CreateCertificateRequest(ctx.providers.Random, template, privateKey); err != nil {
 		return fmt.Errorf("failed to create certificate request: %w", err)
 	}
 
@@ -366,7 +365,7 @@ func (ctx *CmdCtx) CryptoCertificateGenerateRunE(cmd *cobra.Command, _ []string,
 		signatureKey = caPrivateKey
 	}
 
-	if template, err = cryptoGetCertificateFromCmd(cmd); err != nil {
+	if template, err = ctx.cryptoGetCertificateFromCmd(cmd); err != nil {
 		return err
 	}
 
@@ -423,7 +422,7 @@ func (ctx *CmdCtx) CryptoCertificateGenerateRunE(cmd *cobra.Command, _ []string,
 
 	b.Reset()
 
-	if certificate, err = x509.CreateCertificate(rand.Reader, template, parent, publicKey, signatureKey); err != nil {
+	if certificate, err = x509.CreateCertificate(ctx.providers.Random, template, parent, publicKey, signatureKey); err != nil {
 		return fmt.Errorf("failed to create certificate: %w", err)
 	}
 
diff --git a/internal/commands/crypto_helper.go b/internal/commands/crypto_helper.go
index 1827970ed..17ee4060f 100644
--- a/internal/commands/crypto_helper.go
+++ b/internal/commands/crypto_helper.go
@@ -4,7 +4,6 @@ import (
 	"crypto/ecdsa"
 	"crypto/ed25519"
 	"crypto/elliptic"
-	"crypto/rand"
 	"crypto/rsa"
 	"crypto/x509"
 	"crypto/x509/pkix"
@@ -130,7 +129,7 @@ func cryptoGetWritePathsFromCmd(cmd *cobra.Command) (privateKey, publicKey strin
 	return filepath.Join(dir, private), filepath.Join(dir, public), nil
 }
 
-func cryptoGenPrivateKeyFromCmd(cmd *cobra.Command) (privateKey any, err error) {
+func (ctx *CmdCtx) cryptoGenPrivateKeyFromCmd(cmd *cobra.Command) (privateKey any, err error) {
 	switch cmd.Parent().Use {
 	case cmdUseRSA:
 		var (
@@ -141,7 +140,7 @@ func cryptoGenPrivateKeyFromCmd(cmd *cobra.Command) (privateKey any, err error)
 			return nil, err
 		}
 
-		if privateKey, err = rsa.GenerateKey(rand.Reader, bits); err != nil {
+		if privateKey, err = rsa.GenerateKey(ctx.providers.Random, bits); err != nil {
 			return nil, fmt.Errorf("generating RSA private key resulted in an error: %w", err)
 		}
 	case cmdUseECDSA:
@@ -158,11 +157,11 @@ func cryptoGenPrivateKeyFromCmd(cmd *cobra.Command) (privateKey any, err error)
 			return nil, fmt.Errorf("invalid curve '%s' was specified: curve must be P224, P256, P384, or P521", curveStr)
 		}
 
-		if privateKey, err = ecdsa.GenerateKey(curve, rand.Reader); err != nil {
+		if privateKey, err = ecdsa.GenerateKey(curve, ctx.providers.Random); err != nil {
 			return nil, fmt.Errorf("generating ECDSA private key resulted in an error: %w", err)
 		}
 	case cmdUseEd25519:
-		if _, privateKey, err = ed25519.GenerateKey(rand.Reader); err != nil {
+		if _, privateKey, err = ed25519.GenerateKey(ctx.providers.Random); err != nil {
 			return nil, fmt.Errorf("generating Ed25519 private key resulted in an error: %w", err)
 		}
 	}
@@ -336,7 +335,7 @@ func cryptoGetSubjectFromCmd(cmd *cobra.Command) (subject *pkix.Name, err error)
 	}, nil
 }
 
-func cryptoGetCertificateFromCmd(cmd *cobra.Command) (certificate *x509.Certificate, err error) {
+func (ctx *CmdCtx) cryptoGetCertificateFromCmd(cmd *cobra.Command) (certificate *x509.Certificate, err error) {
 	var (
 		ca           bool
 		subject      *pkix.Name
@@ -378,7 +377,7 @@ func cryptoGetCertificateFromCmd(cmd *cobra.Command) (certificate *x509.Certific
 
 	serialNumberLimit := new(big.Int).Lsh(big.NewInt(1), 128)
 
-	if serialNumber, err = rand.Int(rand.Reader, serialNumberLimit); err != nil {
+	if serialNumber, err = ctx.providers.Random.IntErr(serialNumberLimit); err != nil {
 		return nil, fmt.Errorf("failed to generate serial number: %w", err)
 	}
 
diff --git a/internal/commands/root.go b/internal/commands/root.go
index 29a1bdc0d..29fdad27a 100644
--- a/internal/commands/root.go
+++ b/internal/commands/root.go
@@ -122,6 +122,8 @@ func runServices(ctx *CmdCtx) {
 		}()
 
 		if mainServer, mainListener, err = server.CreateDefaultServer(*ctx.config, ctx.providers); err != nil {
+			ctx.log.WithError(err).Error("Create Server (main) returned error")
+
 			return err
 		}
 
@@ -146,6 +148,8 @@ func runServices(ctx *CmdCtx) {
 		}()
 
 		if metricsServer, metricsListener, err = server.CreateMetricsServer(ctx.config.Telemetry.Metrics); err != nil {
+			ctx.log.WithError(err).Error("Create Server (metrics) returned error")
+
 			return err
 		}
 
@@ -163,7 +167,11 @@ func runServices(ctx *CmdCtx) {
 		if watcher, err := runServiceFileWatcher(ctx, ctx.config.AuthenticationBackend.File.Path, provider); err != nil {
 			ctx.log.WithError(err).Errorf("Error opening file watcher")
 		} else {
-			defer watcher.Close()
+			defer func(watcher *fsnotify.Watcher) {
+				if err := watcher.Close(); err != nil {
+					ctx.log.WithError(err).Errorf("Error closing file watcher")
+				}
+			}(watcher)
 		}
 	}
 
diff --git a/internal/commands/storage_run.go b/internal/commands/storage_run.go
index d6ce0632d..fb39bd7f9 100644
--- a/internal/commands/storage_run.go
+++ b/internal/commands/storage_run.go
@@ -18,6 +18,7 @@ import (
 
 	"github.com/authelia/authelia/v4/internal/configuration/validator"
 	"github.com/authelia/authelia/v4/internal/model"
+	"github.com/authelia/authelia/v4/internal/random"
 	"github.com/authelia/authelia/v4/internal/storage"
 	"github.com/authelia/authelia/v4/internal/totp"
 	"github.com/authelia/authelia/v4/internal/utils"
@@ -983,7 +984,8 @@ func (ctx *CmdCtx) StorageUserTOTPExportPNGRunE(cmd *cobra.Command, _ []string)
 	}
 
 	if dir == "" {
-		dir = utils.RandomString(8, utils.CharSetAlphaNumeric)
+		rand := &random.Cryptographical{}
+		dir = rand.StringCustom(8, random.CharSetAlphaNumeric)
 	}
 
 	if _, err = os.Stat(dir); !os.IsNotExist(err) {
diff --git a/internal/commands/util.go b/internal/commands/util.go
index 3142088e7..4950c271b 100644
--- a/internal/commands/util.go
+++ b/internal/commands/util.go
@@ -14,7 +14,7 @@ import (
 	"golang.org/x/term"
 
 	"github.com/authelia/authelia/v4/internal/configuration"
-	"github.com/authelia/authelia/v4/internal/utils"
+	"github.com/authelia/authelia/v4/internal/random"
 )
 
 func recoverErr(i any) error {
@@ -77,29 +77,29 @@ func flagsGetRandomCharacters(flags *pflag.FlagSet, flagNameLength, flagNameChar
 
 		switch c {
 		case "ascii":
-			charset = utils.CharSetASCII
+			charset = random.CharSetASCII
 		case "alphanumeric":
-			charset = utils.CharSetAlphaNumeric
+			charset = random.CharSetAlphaNumeric
 		case "alphanumeric-lower":
-			charset = utils.CharSetAlphabeticLower + utils.CharSetNumeric
+			charset = random.CharSetAlphabeticLower + random.CharSetNumeric
 		case "alphanumeric-upper":
-			charset = utils.CharSetAlphabeticUpper + utils.CharSetNumeric
+			charset = random.CharSetAlphabeticUpper + random.CharSetNumeric
 		case "alphabetic":
-			charset = utils.CharSetAlphabetic
+			charset = random.CharSetAlphabetic
 		case "alphabetic-lower":
-			charset = utils.CharSetAlphabeticLower
+			charset = random.CharSetAlphabeticLower
 		case "alphabetic-upper":
-			charset = utils.CharSetAlphabeticUpper
+			charset = random.CharSetAlphabeticUpper
 		case "numeric-hex":
-			charset = utils.CharSetNumericHex
+			charset = random.CharSetNumericHex
 		case "numeric":
-			charset = utils.CharSetNumeric
+			charset = random.CharSetNumeric
 		case "rfc3986":
-			charset = utils.CharSetRFC3986Unreserved
+			charset = random.CharSetRFC3986Unreserved
 		case "rfc3986-lower":
-			charset = utils.CharSetAlphabeticLower + utils.CharSetNumeric + utils.CharSetSymbolicRFC3986Unreserved
+			charset = random.CharSetAlphabeticLower + random.CharSetNumeric + random.CharSetSymbolicRFC3986Unreserved
 		case "rfc3986-upper":
-			charset = utils.CharSetAlphabeticUpper + utils.CharSetNumeric + utils.CharSetSymbolicRFC3986Unreserved
+			charset = random.CharSetAlphabeticUpper + random.CharSetNumeric + random.CharSetSymbolicRFC3986Unreserved
 		default:
 			return "", fmt.Errorf("flag '--%s' with value '%s' is invalid, must be one of 'ascii', 'alphanumeric', 'alphabetic', 'numeric', 'numeric-hex', or 'rfc3986'", flagNameCharSet, c)
 		}
@@ -109,7 +109,9 @@ func flagsGetRandomCharacters(flags *pflag.FlagSet, flagNameLength, flagNameChar
 		}
 	}
 
-	return utils.RandomString(n, charset), nil
+	rand := &random.Cryptographical{}
+
+	return rand.StringCustom(n, charset), nil
 }
 
 func termReadConfirmation(flags *pflag.FlagSet, name, prompt, confirmation string) (confirmed bool, err error) {
diff --git a/internal/configuration/config.template.yml b/internal/configuration/config.template.yml
index 7764dc4dc..6dc5a39eb 100644
--- a/internal/configuration/config.template.yml
+++ b/internal/configuration/config.template.yml
@@ -1394,15 +1394,9 @@ notifier:
         ## Sets the client to public. This should typically not be set, please see the documentation for usage.
         # public: false
 
-        ## The policy to require for this client; one_factor or two_factor.
-        # authorization_policy: two_factor
-
-        ## The consent mode controls how consent is obtained.
-        # consent_mode: auto
-
-        ## This value controls the duration a consent on this client remains remembered when the consent mode is
-        ## configured as 'auto' or 'pre-configured'.
-        # pre_configured_consent_duration: 1w
+        ## Redirect URI's specifies a list of valid case-sensitive callbacks for this client.
+        # redirect_uris:
+        # - https://oidc.example.com:8080/oauth2/callback
 
         ## Audience this client is allowed to request.
         # audience: []
@@ -1414,10 +1408,6 @@ notifier:
           # - email
           # - profile
 
-        ## Redirect URI's specifies a list of valid case-sensitive callbacks for this client.
-        # redirect_uris:
-        # - https://oidc.example.com:8080/oauth2/callback
-
         ## Grant Types configures which grants this client can obtain.
         ## It's not recommended to define this unless you know what you're doing.
         # grant_types:
@@ -1435,6 +1425,23 @@ notifier:
           # - query
           # - fragment
 
+        ## The policy to require for this client; one_factor or two_factor.
+        # authorization_policy: two_factor
+
+        ## Enforces the use of PKCE for this client when set to true.
+        # enforce_pkce: false
+
+        ## Enforces the use of PKCE for this client when configured, and enforces the specified challenge method.
+        ## Options are 'plain' and 'S256'.
+        # pkce_challenge_method: S256
+
         ## The algorithm used to sign userinfo endpoint responses for this client, either none or RS256.
         # userinfo_signing_algorithm: none
+
+        ## The consent mode controls how consent is obtained.
+        # consent_mode: auto
+
+        ## This value controls the duration a consent on this client remains remembered when the consent mode is
+        ## configured as 'auto' or 'pre-configured'.
+        # pre_configured_consent_duration: 1w
 ...
diff --git a/internal/configuration/schema/identity_providers.go b/internal/configuration/schema/identity_providers.go
index 04c6f35f9..d56d79f57 100644
--- a/internal/configuration/schema/identity_providers.go
+++ b/internal/configuration/schema/identity_providers.go
@@ -57,10 +57,13 @@ type OpenIDConnectClientConfiguration struct {
 	ResponseTypes []string `koanf:"response_types"`
 	ResponseModes []string `koanf:"response_modes"`
 
-	UserinfoSigningAlgorithm string `koanf:"userinfo_signing_algorithm"`
-
 	Policy string `koanf:"authorization_policy"`
 
+	EnforcePKCE bool `koanf:"enforce_pkce"`
+
+	PKCEChallengeMethod      string `koanf:"pkce_challenge_method"`
+	UserinfoSigningAlgorithm string `koanf:"userinfo_signing_algorithm"`
+
 	ConsentMode                  string         `koanf:"consent_mode"`
 	ConsentPreConfiguredDuration *time.Duration `koanf:"pre_configured_consent_duration"`
 }
diff --git a/internal/configuration/schema/keys.go b/internal/configuration/schema/keys.go
index bcd577f39..07967dc88 100644
--- a/internal/configuration/schema/keys.go
+++ b/internal/configuration/schema/keys.go
@@ -43,8 +43,10 @@ var Keys = []string{
 	"identity_providers.oidc.clients[].grant_types",
 	"identity_providers.oidc.clients[].response_types",
 	"identity_providers.oidc.clients[].response_modes",
-	"identity_providers.oidc.clients[].userinfo_signing_algorithm",
 	"identity_providers.oidc.clients[].authorization_policy",
+	"identity_providers.oidc.clients[].enforce_pkce",
+	"identity_providers.oidc.clients[].pkce_challenge_method",
+	"identity_providers.oidc.clients[].userinfo_signing_algorithm",
 	"identity_providers.oidc.clients[].consent_mode",
 	"identity_providers.oidc.clients[].pre_configured_consent_duration",
 	"authentication_backend.password_reset.disable",
diff --git a/internal/configuration/validator/const.go b/internal/configuration/validator/const.go
index 014e33583..cf1a8eea0 100644
--- a/internal/configuration/validator/const.go
+++ b/internal/configuration/validator/const.go
@@ -6,7 +6,6 @@ import (
 	"github.com/go-webauthn/webauthn/protocol"
 
 	"github.com/authelia/authelia/v4/internal/configuration/schema"
-
 	"github.com/authelia/authelia/v4/internal/oidc"
 )
 
@@ -172,6 +171,8 @@ const (
 		"invalid value: redirect uri '%s' must have the scheme but it is absent"
 	errFmtOIDCClientInvalidPolicy = "identity_providers: oidc: client '%s': option 'policy' must be 'one_factor' " +
 		"or 'two_factor' but it is configured as '%s'"
+	errFmtOIDCClientInvalidPKCEChallengeMethod = "identity_providers: oidc: client '%s': option 'pkce_challenge_method' must be 'plain' " +
+		"or 'S256' but it is configured as '%s'"
 	errFmtOIDCClientInvalidConsentMode = "identity_providers: oidc: client '%s': consent: option 'mode' must be one of " +
 		"'%s' but it is configured as '%s'"
 	errFmtOIDCClientInvalidEntry = "identity_providers: oidc: client '%s': option '%s' must only have the values " +
diff --git a/internal/configuration/validator/identity_providers.go b/internal/configuration/validator/identity_providers.go
index 23a797153..d63f2fb04 100644
--- a/internal/configuration/validator/identity_providers.go
+++ b/internal/configuration/validator/identity_providers.go
@@ -175,6 +175,13 @@ func validateOIDCClients(config *schema.OpenIDConnectConfiguration, val *schema.
 			val.Push(fmt.Errorf(errFmtOIDCClientInvalidPolicy, client.ID, client.Policy))
 		}
 
+		switch client.PKCEChallengeMethod {
+		case "", "plain", "S256":
+			break
+		default:
+			val.Push(fmt.Errorf(errFmtOIDCClientInvalidPKCEChallengeMethod, client.ID, client.PKCEChallengeMethod))
+		}
+
 		validateOIDCClientConsentMode(c, config, val)
 		validateOIDCClientSectorIdentifier(client, val)
 		validateOIDCClientScopes(c, config, val)
diff --git a/internal/configuration/validator/identity_providers_test.go b/internal/configuration/validator/identity_providers_test.go
index 32118a066..cd3bc0012 100644
--- a/internal/configuration/validator/identity_providers_test.go
+++ b/internal/configuration/validator/identity_providers_test.go
@@ -331,6 +331,40 @@ func TestShouldRaiseErrorWhenOIDCServerClientBadValues(t *testing.T) {
 				fmt.Sprintf(errFmtOIDCClientInvalidConsentMode, "client-bad-consent-mode", strings.Join(append(validOIDCClientConsentModes, "auto"), "', '"), "cap"),
 			},
 		},
+		{
+			Name: "InvalidPKCEChallengeMethod",
+			Clients: []schema.OpenIDConnectClientConfiguration{
+				{
+					ID:     "client-bad-pkce-mode",
+					Secret: MustDecodeSecret("$plaintext$a-secret"),
+					Policy: policyTwoFactor,
+					RedirectURIs: []string{
+						"https://google.com",
+					},
+					PKCEChallengeMethod: "abc",
+				},
+			},
+			Errors: []string{
+				fmt.Sprintf(errFmtOIDCClientInvalidPKCEChallengeMethod, "client-bad-pkce-mode", "abc"),
+			},
+		},
+		{
+			Name: "InvalidPKCEChallengeMethodLowerCaseS256",
+			Clients: []schema.OpenIDConnectClientConfiguration{
+				{
+					ID:     "client-bad-pkce-mode-s256",
+					Secret: MustDecodeSecret("$plaintext$a-secret"),
+					Policy: policyTwoFactor,
+					RedirectURIs: []string{
+						"https://google.com",
+					},
+					PKCEChallengeMethod: "s256",
+				},
+			},
+			Errors: []string{
+				fmt.Sprintf(errFmtOIDCClientInvalidPKCEChallengeMethod, "client-bad-pkce-mode-s256", "s256"),
+			},
+		},
 	}
 
 	for _, tc := range testCases {
@@ -609,7 +643,7 @@ func TestValidateIdentityProvidersShouldRaiseErrorsOnInvalidClientTypes(t *testi
 	assert.EqualError(t, validator.Errors()[1], fmt.Sprintf(errFmtOIDCClientRedirectURIPublic, "client-with-bad-redirect-uri", oauth2InstalledApp))
 }
 
-func TestValidateIdentityProvidersShouldNotRaiseErrorsOnValidPublicClients(t *testing.T) {
+func TestValidateIdentityProvidersShouldNotRaiseErrorsOnValidClientOptions(t *testing.T) {
 	validator := schema.NewStructValidator()
 	config := &schema.IdentityProvidersConfiguration{
 		OIDC: &schema.OpenIDConnectConfiguration{
@@ -640,6 +674,24 @@ func TestValidateIdentityProvidersShouldNotRaiseErrorsOnValidPublicClients(t *te
 						"http://127.0.0.1",
 					},
 				},
+				{
+					ID:     "client-with-pkce-mode-plain",
+					Public: true,
+					Policy: "two_factor",
+					RedirectURIs: []string{
+						"https://pkce.com",
+					},
+					PKCEChallengeMethod: "plain",
+				},
+				{
+					ID:     "client-with-pkce-mode-S256",
+					Public: true,
+					Policy: "two_factor",
+					RedirectURIs: []string{
+						"https://pkce.com",
+					},
+					PKCEChallengeMethod: "S256",
+				},
 			},
 		},
 	}
diff --git a/internal/handlers/handler_checks_safe_redirection_test.go b/internal/handlers/handler_checks_safe_redirection_test.go
index 807588deb..a77fefabb 100644
--- a/internal/handlers/handler_checks_safe_redirection_test.go
+++ b/internal/handlers/handler_checks_safe_redirection_test.go
@@ -63,3 +63,33 @@ func TestCheckSafeRedirection_SafeRedirection(t *testing.T) {
 		OK: true,
 	})
 }
+
+func TestShouldFailOnInvalidBody(t *testing.T) {
+	mock := mocks.NewMockAutheliaCtxWithUserSession(t, session.UserSession{
+		Username:            "john",
+		AuthenticationLevel: authentication.OneFactor,
+	})
+	defer mock.Close()
+	mock.Ctx.Configuration.Session.Domain = exampleDotComDomain
+
+	mock.SetRequestBody(t, "not a valid json")
+
+	CheckSafeRedirectionPOST(mock.Ctx)
+	mock.Assert200KO(t, "Operation failed.")
+}
+
+func TestShouldFailOnInvalidURL(t *testing.T) {
+	mock := mocks.NewMockAutheliaCtxWithUserSession(t, session.UserSession{
+		Username:            "john",
+		AuthenticationLevel: authentication.OneFactor,
+	})
+	defer mock.Close()
+	mock.Ctx.Configuration.Session.Domain = exampleDotComDomain
+
+	mock.SetRequestBody(t, checkURIWithinDomainRequestBody{
+		URI: "https//invalid-url",
+	})
+
+	CheckSafeRedirectionPOST(mock.Ctx)
+	mock.Assert200KO(t, "Operation failed.")
+}
diff --git a/internal/handlers/handler_configuration_password_policy_test.go b/internal/handlers/handler_configuration_password_policy_test.go
new file mode 100644
index 000000000..600c89dfd
--- /dev/null
+++ b/internal/handlers/handler_configuration_password_policy_test.go
@@ -0,0 +1,83 @@
+package handlers
+
+import (
+	// "strings".
+	"encoding/json"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"github.com/stretchr/testify/suite"
+
+	"github.com/authelia/authelia/v4/internal/mocks"
+)
+
+type passwordPolicyResponseBody struct {
+	Status string
+	Data   PasswordPolicyBody
+}
+
+type PasswordPolicySuite struct {
+	suite.Suite
+
+	mock *mocks.MockAutheliaCtx
+}
+
+func (s *PasswordPolicySuite) SetupTest() {
+	s.mock = mocks.NewMockAutheliaCtx(s.T())
+}
+
+func (s *PasswordPolicySuite) TearDownTest() {
+	s.mock.Close()
+}
+
+func (s *PasswordPolicySuite) TestShouldBeDisabled() {
+	s.mock.Ctx.Configuration.PasswordPolicy.ZXCVBN.Enabled = false
+	s.mock.Ctx.Configuration.PasswordPolicy.Standard.Enabled = false
+
+	PasswordPolicyConfigurationGET(s.mock.Ctx)
+
+	response := &passwordPolicyResponseBody{}
+	err := json.Unmarshal(s.mock.Ctx.Response.Body(), response)
+
+	require.NoError(s.T(), err)
+	assert.Equal(s.T(), 200, s.mock.Ctx.Response.StatusCode())
+	assert.Equal(s.T(), "disabled", response.Data.Mode)
+}
+
+func (s *PasswordPolicySuite) TestShouldBeStandard() {
+	s.mock.Ctx.Configuration.PasswordPolicy.ZXCVBN.Enabled = false
+	s.mock.Ctx.Configuration.PasswordPolicy.Standard.Enabled = true
+	s.mock.Ctx.Configuration.PasswordPolicy.Standard.MinLength = 4
+	s.mock.Ctx.Configuration.PasswordPolicy.Standard.MaxLength = 8
+
+	PasswordPolicyConfigurationGET(s.mock.Ctx)
+
+	response := &passwordPolicyResponseBody{}
+	err := json.Unmarshal(s.mock.Ctx.Response.Body(), response)
+
+	require.NoError(s.T(), err)
+	assert.Equal(s.T(), 200, s.mock.Ctx.Response.StatusCode())
+	assert.Equal(s.T(), "standard", response.Data.Mode)
+	assert.Equal(s.T(), 4, response.Data.MinLength)
+	assert.Equal(s.T(), 8, response.Data.MaxLength)
+}
+
+func (s *PasswordPolicySuite) TestShouldBeZXCVBN() {
+	s.mock.Ctx.Configuration.PasswordPolicy.ZXCVBN.Enabled = true
+	s.mock.Ctx.Configuration.PasswordPolicy.Standard.Enabled = false
+
+	PasswordPolicyConfigurationGET(s.mock.Ctx)
+
+	response := &passwordPolicyResponseBody{}
+	err := json.Unmarshal(s.mock.Ctx.Response.Body(), response)
+
+	require.NoError(s.T(), err)
+	assert.Equal(s.T(), 200, s.mock.Ctx.Response.StatusCode())
+	assert.Equal(s.T(), "zxcvbn", response.Data.Mode)
+}
+
+func TestRunPasswordPolicySuite(t *testing.T) {
+	s := new(PasswordPolicySuite)
+	suite.Run(t, s)
+}
diff --git a/internal/handlers/handler_health_test.go b/internal/handlers/handler_health_test.go
new file mode 100644
index 000000000..f268fccf7
--- /dev/null
+++ b/internal/handlers/handler_health_test.go
@@ -0,0 +1,26 @@
+package handlers
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/authelia/authelia/v4/internal/authentication"
+	"github.com/authelia/authelia/v4/internal/mocks"
+	"github.com/authelia/authelia/v4/internal/session"
+)
+
+var okMessageBytes = []byte("{\"status\":\"OK\"}")
+
+func TestHealthOk(t *testing.T) {
+	mock := mocks.NewMockAutheliaCtxWithUserSession(t, session.UserSession{
+		Username:            "john",
+		AuthenticationLevel: authentication.OneFactor,
+	})
+	defer mock.Close()
+
+	HealthGET(mock.Ctx)
+
+	assert.Equal(t, 200, mock.Ctx.Response.StatusCode())
+	assert.Equal(t, okMessageBytes, mock.Ctx.Response.Body())
+}
diff --git a/internal/handlers/handler_oidc_authorization.go b/internal/handlers/handler_oidc_authorization.go
index 1bf85a25f..73e821927 100644
--- a/internal/handlers/handler_oidc_authorization.go
+++ b/internal/handlers/handler_oidc_authorization.go
@@ -52,6 +52,16 @@ func OpenIDConnectAuthorization(ctx *middlewares.AutheliaCtx, rw http.ResponseWr
 		return
 	}
 
+	if err = client.ValidateAuthorizationPolicy(requester); err != nil {
+		rfc := fosite.ErrorToRFC6749Error(err)
+
+		ctx.Logger.Errorf("Authorization Request with id '%s' on client with id '%s' failed to validate the authorization policy: %s", requester.GetID(), clientID, rfc.WithExposeDebug(true).GetDescription())
+
+		ctx.Providers.OpenIDConnect.WriteAuthorizeError(ctx, rw, requester, err)
+
+		return
+	}
+
 	issuer = ctx.RootURL()
 
 	userSession := ctx.GetSession()
diff --git a/internal/middlewares/authelia_context.go b/internal/middlewares/authelia_context.go
index 86a7d30ae..8dde8c49f 100644
--- a/internal/middlewares/authelia_context.go
+++ b/internal/middlewares/authelia_context.go
@@ -407,3 +407,8 @@ func (ctx *AutheliaCtx) SetContentTypeTextHTML() {
 func (ctx *AutheliaCtx) SetContentTypeApplicationJSON() {
 	ctx.SetContentTypeBytes(contentTypeApplicationJSON)
 }
+
+// SetContentTypeApplicationYAML efficiently sets the Content-Type header to 'application/yaml; charset=utf-8'.
+func (ctx *AutheliaCtx) SetContentTypeApplicationYAML() {
+	ctx.SetContentTypeBytes(contentTypeApplicationYAML)
+}
diff --git a/internal/middlewares/authelia_context_test.go b/internal/middlewares/authelia_context_test.go
index bd857c835..57ac0f613 100644
--- a/internal/middlewares/authelia_context_test.go
+++ b/internal/middlewares/authelia_context_test.go
@@ -13,9 +13,66 @@ import (
 	"github.com/authelia/authelia/v4/internal/middlewares"
 	"github.com/authelia/authelia/v4/internal/mocks"
 	"github.com/authelia/authelia/v4/internal/model"
+	"github.com/authelia/authelia/v4/internal/random"
 	"github.com/authelia/authelia/v4/internal/session"
 )
 
+func TestContentTypes(t *testing.T) {
+	testCases := []struct {
+		name     string
+		setup    func(ctx *middlewares.AutheliaCtx) (err error)
+		expected string
+	}{
+		{
+			name: "ApplicationJSON",
+			setup: func(ctx *middlewares.AutheliaCtx) (err error) {
+				ctx.SetContentTypeApplicationJSON()
+
+				return nil
+			},
+			expected: "application/json; charset=utf-8",
+		},
+		{
+			name: "ApplicationYAML",
+			setup: func(ctx *middlewares.AutheliaCtx) (err error) {
+				ctx.SetContentTypeApplicationYAML()
+
+				return nil
+			},
+			expected: "application/yaml; charset=utf-8",
+		},
+		{
+			name: "TextPlain",
+			setup: func(ctx *middlewares.AutheliaCtx) (err error) {
+				ctx.SetContentTypeTextPlain()
+
+				return nil
+			},
+			expected: "text/plain; charset=utf-8",
+		},
+		{
+			name: "TextHTML",
+			setup: func(ctx *middlewares.AutheliaCtx) (err error) {
+				ctx.SetContentTypeTextHTML()
+
+				return nil
+			},
+			expected: "text/html; charset=utf-8",
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			mock := mocks.NewMockAutheliaCtx(t)
+			defer mock.Close()
+
+			assert.NoError(t, tc.setup(mock.Ctx))
+
+			assert.Equal(t, tc.expected, string(mock.Ctx.Response.Header.ContentType()))
+		})
+	}
+}
+
 func TestIssuerURL(t *testing.T) {
 	testCases := []struct {
 		name              string
@@ -44,8 +101,8 @@ func TestIssuerURL(t *testing.T) {
 			mock := mocks.NewMockAutheliaCtx(t)
 			defer mock.Close()
 
-			mock.Ctx.Request.Header.Set("X-Forwarded-Proto", tc.proto)
-			mock.Ctx.Request.Header.Set("X-Forwarded-Host", tc.host)
+			mock.Ctx.Request.Header.Set(fasthttp.HeaderXForwardedProto, tc.proto)
+			mock.Ctx.Request.Header.Set(fasthttp.HeaderXForwardedHost, tc.host)
 
 			if tc.base != "" {
 				mock.Ctx.SetUserValue("base_url", tc.base)
@@ -72,6 +129,7 @@ func TestShouldCallNextWithAutheliaCtx(t *testing.T) {
 	providers := middlewares.Providers{
 		UserProvider:    userProvider,
 		SessionProvider: sessionProvider,
+		Random:          random.NewMathematical(),
 	}
 	nextCalled := false
 
@@ -103,8 +161,8 @@ func TestShouldGetOriginalURLFromOriginalURLHeader(t *testing.T) {
 func TestShouldGetOriginalURLFromForwardedHeadersWithoutURI(t *testing.T) {
 	mock := mocks.NewMockAutheliaCtx(t)
 	defer mock.Close()
-	mock.Ctx.Request.Header.Set("X-Forwarded-Proto", "https")
-	mock.Ctx.Request.Header.Set("X-Forwarded-Host", "home.example.com")
+	mock.Ctx.Request.Header.Set(fasthttp.HeaderXForwardedProto, "https")
+	mock.Ctx.Request.Header.Set(fasthttp.HeaderXForwardedHost, "home.example.com")
 	originalURL, err := mock.Ctx.GetOriginalURL()
 	assert.NoError(t, err)
 
@@ -142,7 +200,7 @@ func TestShouldOnlyFallbackToNonXForwardedHeadersWhenNil(t *testing.T) {
 	mock.Ctx.RequestCtx.Request.SetHost("localhost")
 	mock.Ctx.RequestCtx.Request.Header.Set(fasthttp.HeaderXForwardedHost, "auth.example.com:1234")
 	mock.Ctx.RequestCtx.Request.Header.Set("X-Forwarded-URI", "/base/2fa/one-time-password")
-	mock.Ctx.RequestCtx.Request.Header.Set("X-Forwarded-Proto", "https")
+	mock.Ctx.RequestCtx.Request.Header.Set(fasthttp.HeaderXForwardedProto, "https")
 	mock.Ctx.RequestCtx.Request.Header.Set("X-Forwarded-Method", "GET")
 
 	assert.Equal(t, []byte("https"), mock.Ctx.XForwardedProto())
diff --git a/internal/middlewares/const.go b/internal/middlewares/const.go
index 83f832545..ee2c49955 100644
--- a/internal/middlewares/const.go
+++ b/internal/middlewares/const.go
@@ -88,6 +88,7 @@ var (
 	contentTypeTextPlain       = []byte("text/plain; charset=utf-8")
 	contentTypeTextHTML        = []byte("text/html; charset=utf-8")
 	contentTypeApplicationJSON = []byte("application/json; charset=utf-8")
+	contentTypeApplicationYAML = []byte("application/yaml; charset=utf-8")
 )
 
 const (
diff --git a/internal/middlewares/identity_verification_test.go b/internal/middlewares/identity_verification_test.go
index bb81141fa..2831eef3b 100644
--- a/internal/middlewares/identity_verification_test.go
+++ b/internal/middlewares/identity_verification_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
+	"github.com/valyala/fasthttp"
 
 	"github.com/authelia/authelia/v4/internal/middlewares"
 	"github.com/authelia/authelia/v4/internal/mocks"
@@ -73,8 +74,8 @@ func TestShouldFailSendingAnEmail(t *testing.T) {
 	defer mock.Close()
 
 	mock.Ctx.Configuration.JWTSecret = testJWTSecret
-	mock.Ctx.Request.Header.Add("X-Forwarded-Proto", "http")
-	mock.Ctx.Request.Header.Add("X-Forwarded-Host", "host")
+	mock.Ctx.Request.Header.Add(fasthttp.HeaderXForwardedProto, "http")
+	mock.Ctx.Request.Header.Add(fasthttp.HeaderXForwardedHost, "host")
 
 	mock.StorageMock.EXPECT().
 		SaveIdentityVerification(mock.Ctx, gomock.Any()).
@@ -95,8 +96,8 @@ func TestShouldSucceedIdentityVerificationStartProcess(t *testing.T) {
 	mock := mocks.NewMockAutheliaCtx(t)
 
 	mock.Ctx.Configuration.JWTSecret = testJWTSecret
-	mock.Ctx.Request.Header.Add("X-Forwarded-Proto", "http")
-	mock.Ctx.Request.Header.Add("X-Forwarded-Host", "host")
+	mock.Ctx.Request.Header.Add(fasthttp.HeaderXForwardedProto, "http")
+	mock.Ctx.Request.Header.Add(fasthttp.HeaderXForwardedHost, "host")
 
 	mock.StorageMock.EXPECT().
 		SaveIdentityVerification(mock.Ctx, gomock.Any()).
diff --git a/internal/middlewares/timing_attack_delay.go b/internal/middlewares/timing_attack_delay.go
index 163f8752c..b8b497d8c 100644
--- a/internal/middlewares/timing_attack_delay.go
+++ b/internal/middlewares/timing_attack_delay.go
@@ -1,7 +1,6 @@
 package middlewares
 
 import (
-	"crypto/rand"
 	"math"
 	"math/big"
 	"sync"
@@ -62,7 +61,7 @@ func movingAverageIteration(value time.Duration, history int, successful bool, c
 }
 
 func calculateActualDelay(ctx *AutheliaCtx, execDuration time.Duration, execDurationAvgMs, minDelayMs float64, maxRandomMs int64, successful bool) (actualDelayMs float64) {
-	randomDelayMs, err := rand.Int(rand.Reader, big.NewInt(maxRandomMs))
+	randomDelayMs, err := ctx.Providers.Random.IntErr(big.NewInt(maxRandomMs))
 	if err != nil {
 		return float64(maxRandomMs)
 	}
diff --git a/internal/middlewares/timing_attack_delay_test.go b/internal/middlewares/timing_attack_delay_test.go
index d7428a1b0..976be04a8 100644
--- a/internal/middlewares/timing_attack_delay_test.go
+++ b/internal/middlewares/timing_attack_delay_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/authelia/authelia/v4/internal/logging"
+	"github.com/authelia/authelia/v4/internal/random"
 )
 
 func TestTimingAttackDelayAverages(t *testing.T) {
@@ -45,7 +46,12 @@ func TestTimingAttackDelayCalculations(t *testing.T) {
 	avgExecDurationMs := 1000.0
 	expectedMinimumDelayMs := avgExecDurationMs - float64(execDuration.Milliseconds())
 
-	ctx := &AutheliaCtx{Logger: logging.Logger().WithFields(logrus.Fields{})}
+	ctx := &AutheliaCtx{
+		Logger: logging.Logger().WithFields(logrus.Fields{}),
+		Providers: Providers{
+			Random: &random.Cryptographical{},
+		},
+	}
 
 	for i := 0; i < 100; i++ {
 		delay := calculateActualDelay(ctx, execDuration, avgExecDurationMs, 250, 85, false)
diff --git a/internal/middlewares/types.go b/internal/middlewares/types.go
index 2e7d8542a..175bb0e69 100644
--- a/internal/middlewares/types.go
+++ b/internal/middlewares/types.go
@@ -11,6 +11,7 @@ import (
 	"github.com/authelia/authelia/v4/internal/notification"
 	"github.com/authelia/authelia/v4/internal/ntp"
 	"github.com/authelia/authelia/v4/internal/oidc"
+	"github.com/authelia/authelia/v4/internal/random"
 	"github.com/authelia/authelia/v4/internal/regulation"
 	"github.com/authelia/authelia/v4/internal/session"
 	"github.com/authelia/authelia/v4/internal/storage"
@@ -44,6 +45,7 @@ type Providers struct {
 	Templates       *templates.Provider
 	TOTP            totp.Provider
 	PasswordPolicy  PasswordPolicyProvider
+	Random          random.Provider
 }
 
 // RequestHandler represents an Authelia request handler.
diff --git a/internal/mocks/authelia_ctx.go b/internal/mocks/authelia_ctx.go
index 26a4a876f..b7fef421c 100644
--- a/internal/mocks/authelia_ctx.go
+++ b/internal/mocks/authelia_ctx.go
@@ -16,6 +16,7 @@ import (
 	"github.com/authelia/authelia/v4/internal/authorization"
 	"github.com/authelia/authelia/v4/internal/configuration/schema"
 	"github.com/authelia/authelia/v4/internal/middlewares"
+	"github.com/authelia/authelia/v4/internal/random"
 	"github.com/authelia/authelia/v4/internal/regulation"
 	"github.com/authelia/authelia/v4/internal/session"
 	"github.com/authelia/authelia/v4/internal/templates"
@@ -34,6 +35,7 @@ type MockAutheliaCtx struct {
 	StorageMock      *MockStorage
 	NotifierMock     *MockNotifier
 	TOTPMock         *MockTOTP
+	RandomMock       *MockRandom
 
 	UserSession *session.UserSession
 
@@ -98,6 +100,10 @@ func NewMockAutheliaCtx(t *testing.T) *MockAutheliaCtx {
 	mockAuthelia.TOTPMock = NewMockTOTP(mockAuthelia.Ctrl)
 	providers.TOTP = mockAuthelia.TOTPMock
 
+	mockAuthelia.RandomMock = NewMockRandom(mockAuthelia.Ctrl)
+
+	providers.Random = random.NewMathematical()
+
 	var err error
 
 	if providers.Templates, err = templates.New(templates.Config{}); err != nil {
diff --git a/internal/mocks/gen.go b/internal/mocks/gen.go
index 4ec2697f3..3c54c9612 100644
--- a/internal/mocks/gen.go
+++ b/internal/mocks/gen.go
@@ -8,3 +8,4 @@ package mocks
 //go:generate mockgen -package mocks -destination totp.go -mock_names Provider=MockTOTP github.com/authelia/authelia/v4/internal/totp Provider
 //go:generate mockgen -package mocks -destination storage.go -mock_names Provider=MockStorage github.com/authelia/authelia/v4/internal/storage Provider
 //go:generate mockgen -package mocks -destination duo_api.go -mock_names API=MockAPI github.com/authelia/authelia/v4/internal/duo API
+//go:generate mockgen -package mocks -destination random.go -mock_names Provider=MockRandom github.com/authelia/authelia/v4/internal/random Provider
diff --git a/internal/mocks/random.go b/internal/mocks/random.go
new file mode 100644
index 000000000..9bab56ddd
--- /dev/null
+++ b/internal/mocks/random.go
@@ -0,0 +1,195 @@
+// Code generated by MockGen. DO NOT EDIT.
+// Source: github.com/authelia/authelia/v4/internal/random (interfaces: Provider)
+
+// Package mocks is a generated GoMock package.
+package mocks
+
+import (
+	big "math/big"
+	reflect "reflect"
+
+	gomock "github.com/golang/mock/gomock"
+)
+
+// MockRandom is a mock of Provider interface.
+type MockRandom struct {
+	ctrl     *gomock.Controller
+	recorder *MockRandomMockRecorder
+}
+
+// MockRandomMockRecorder is the mock recorder for MockRandom.
+type MockRandomMockRecorder struct {
+	mock *MockRandom
+}
+
+// NewMockRandom creates a new mock instance.
+func NewMockRandom(ctrl *gomock.Controller) *MockRandom {
+	mock := &MockRandom{ctrl: ctrl}
+	mock.recorder = &MockRandomMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use.
+func (m *MockRandom) EXPECT() *MockRandomMockRecorder {
+	return m.recorder
+}
+
+// Bytes mocks base method.
+func (m *MockRandom) Bytes() []byte {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "Bytes")
+	ret0, _ := ret[0].([]byte)
+	return ret0
+}
+
+// Bytes indicates an expected call of Bytes.
+func (mr *MockRandomMockRecorder) Bytes() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Bytes", reflect.TypeOf((*MockRandom)(nil).Bytes))
+}
+
+// BytesCustom mocks base method.
+func (m *MockRandom) BytesCustom(arg0 int, arg1 []byte) []byte {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "BytesCustom", arg0, arg1)
+	ret0, _ := ret[0].([]byte)
+	return ret0
+}
+
+// BytesCustom indicates an expected call of BytesCustom.
+func (mr *MockRandomMockRecorder) BytesCustom(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BytesCustom", reflect.TypeOf((*MockRandom)(nil).BytesCustom), arg0, arg1)
+}
+
+// BytesCustomErr mocks base method.
+func (m *MockRandom) BytesCustomErr(arg0 int, arg1 []byte) ([]byte, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "BytesCustomErr", arg0, arg1)
+	ret0, _ := ret[0].([]byte)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// BytesCustomErr indicates an expected call of BytesCustomErr.
+func (mr *MockRandomMockRecorder) BytesCustomErr(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BytesCustomErr", reflect.TypeOf((*MockRandom)(nil).BytesCustomErr), arg0, arg1)
+}
+
+// BytesErr mocks base method.
+func (m *MockRandom) BytesErr() ([]byte, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "BytesErr")
+	ret0, _ := ret[0].([]byte)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// BytesErr indicates an expected call of BytesErr.
+func (mr *MockRandomMockRecorder) BytesErr() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BytesErr", reflect.TypeOf((*MockRandom)(nil).BytesErr))
+}
+
+// Int mocks base method.
+func (m *MockRandom) Int(arg0 *big.Int) *big.Int {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "Int", arg0)
+	ret0, _ := ret[0].(*big.Int)
+	return ret0
+}
+
+// Int indicates an expected call of Int.
+func (mr *MockRandomMockRecorder) Int(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Int", reflect.TypeOf((*MockRandom)(nil).Int), arg0)
+}
+
+// IntErr mocks base method.
+func (m *MockRandom) IntErr(arg0 *big.Int) (*big.Int, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "IntErr", arg0)
+	ret0, _ := ret[0].(*big.Int)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// IntErr indicates an expected call of IntErr.
+func (mr *MockRandomMockRecorder) IntErr(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IntErr", reflect.TypeOf((*MockRandom)(nil).IntErr), arg0)
+}
+
+// Integer mocks base method.
+func (m *MockRandom) Integer(arg0 int) int {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "Integer", arg0)
+	ret0, _ := ret[0].(int)
+	return ret0
+}
+
+// Integer indicates an expected call of Integer.
+func (mr *MockRandomMockRecorder) Integer(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Integer", reflect.TypeOf((*MockRandom)(nil).Integer), arg0)
+}
+
+// IntegerErr mocks base method.
+func (m *MockRandom) IntegerErr(arg0 int) (int, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "IntegerErr", arg0)
+	ret0, _ := ret[0].(int)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// IntegerErr indicates an expected call of IntegerErr.
+func (mr *MockRandomMockRecorder) IntegerErr(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IntegerErr", reflect.TypeOf((*MockRandom)(nil).IntegerErr), arg0)
+}
+
+// Read mocks base method.
+func (m *MockRandom) Read(arg0 []byte) (int, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "Read", arg0)
+	ret0, _ := ret[0].(int)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// Read indicates an expected call of Read.
+func (mr *MockRandomMockRecorder) Read(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Read", reflect.TypeOf((*MockRandom)(nil).Read), arg0)
+}
+
+// StringCustom mocks base method.
+func (m *MockRandom) StringCustom(arg0 int, arg1 string) string {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "StringCustom", arg0, arg1)
+	ret0, _ := ret[0].(string)
+	return ret0
+}
+
+// StringCustom indicates an expected call of StringCustom.
+func (mr *MockRandomMockRecorder) StringCustom(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StringCustom", reflect.TypeOf((*MockRandom)(nil).StringCustom), arg0, arg1)
+}
+
+// StringCustomErr mocks base method.
+func (m *MockRandom) StringCustomErr(arg0 int, arg1 string) (string, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "StringCustomErr", arg0, arg1)
+	ret0, _ := ret[0].(string)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// StringCustomErr indicates an expected call of StringCustomErr.
+func (mr *MockRandomMockRecorder) StringCustomErr(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StringCustomErr", reflect.TypeOf((*MockRandom)(nil).StringCustomErr), arg0, arg1)
+}
diff --git a/internal/notification/smtp_notifier.go b/internal/notification/smtp_notifier.go
index 7afda8426..c212b2c9c 100644
--- a/internal/notification/smtp_notifier.go
+++ b/internal/notification/smtp_notifier.go
@@ -14,6 +14,7 @@ import (
 
 	"github.com/authelia/authelia/v4/internal/configuration/schema"
 	"github.com/authelia/authelia/v4/internal/logging"
+	"github.com/authelia/authelia/v4/internal/random"
 	"github.com/authelia/authelia/v4/internal/templates"
 	"github.com/authelia/authelia/v4/internal/utils"
 )
@@ -64,6 +65,7 @@ func NewSMTPNotifier(config *schema.SMTPNotifierConfiguration, certPool *x509.Ce
 	return &SMTPNotifier{
 		config: config,
 		domain: domain,
+		random: &random.Cryptographical{},
 		tls:    utils.NewTLSConfig(config.TLS, certPool),
 		log:    logging.Logger(),
 		opts:   opts,
@@ -74,6 +76,7 @@ func NewSMTPNotifier(config *schema.SMTPNotifierConfiguration, certPool *x509.Ce
 type SMTPNotifier struct {
 	config *schema.SMTPNotifierConfiguration
 	domain string
+	random random.Provider
 	tls    *tls.Config
 	log    *logrus.Logger
 	opts   []gomail.Option
@@ -104,10 +107,10 @@ func (n *SMTPNotifier) StartupCheck() (err error) {
 func (n *SMTPNotifier) Send(ctx context.Context, recipient mail.Address, subject string, et *templates.EmailTemplate, data any) (err error) {
 	msg := gomail.NewMsg(
 		gomail.WithMIMEVersion(gomail.Mime10),
-		gomail.WithBoundary(utils.RandomString(30, utils.CharSetAlphaNumeric)),
+		gomail.WithBoundary(n.random.StringCustom(30, random.CharSetAlphaNumeric)),
 	)
 
-	setMessageID(msg, n.domain)
+	n.setMessageID(msg, n.domain)
 
 	if err = msg.From(n.config.Sender.String()); err != nil {
 		return fmt.Errorf("notifier: smtp: failed to set from address: %w", err)
@@ -161,10 +164,10 @@ func (n *SMTPNotifier) Send(ctx context.Context, recipient mail.Address, subject
 	return nil
 }
 
-func setMessageID(msg *gomail.Msg, domain string) {
-	rn, _ := utils.RandomInt(100000000)
-	rm, _ := utils.RandomInt(10000)
-	rs := utils.RandomString(17, utils.CharSetAlphaNumeric)
+func (n *SMTPNotifier) setMessageID(msg *gomail.Msg, domain string) {
+	rn := n.random.Integer(100000000)
+	rm := n.random.Integer(10000)
+	rs := n.random.StringCustom(17, random.CharSetAlphaNumeric)
 	pid := os.Getpid() + rm
 
 	msg.SetMessageIDWithValue(fmt.Sprintf("%d.%d%d.%s@%s", pid, rn, rm, rs, domain))
diff --git a/internal/ntp/ntp_test.go b/internal/ntp/ntp_test.go
index 3528b84ce..de88edfc3 100644
--- a/internal/ntp/ntp_test.go
+++ b/internal/ntp/ntp_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/authelia/authelia/v4/internal/configuration/validator"
 )
 
-func TestShouldCheckNTP(t *testing.T) {
+func TestShouldCheckNTPV4(t *testing.T) {
 	config := &schema.Configuration{
 		NTP: schema.NTPConfiguration{
 			Address:       "time.cloudflare.com:123",
@@ -26,3 +26,20 @@ func TestShouldCheckNTP(t *testing.T) {
 
 	assert.NoError(t, ntp.StartupCheck())
 }
+
+func TestShouldCheckNTPV3(t *testing.T) {
+	config := &schema.Configuration{
+		NTP: schema.NTPConfiguration{
+			Address:       "time.cloudflare.com:123",
+			Version:       3,
+			MaximumDesync: time.Second * 3,
+		},
+	}
+
+	sv := schema.NewStructValidator()
+	validator.ValidateNTP(config, sv)
+
+	ntp := NewProvider(&config.NTP)
+
+	assert.NoError(t, ntp.StartupCheck())
+}
diff --git a/internal/ntp/util_test.go b/internal/ntp/util_test.go
index 53cb9b819..caf07ca02 100644
--- a/internal/ntp/util_test.go
+++ b/internal/ntp/util_test.go
@@ -9,8 +9,33 @@ import (
 	"github.com/authelia/authelia/v4/internal/utils"
 )
 
-func TestShould(t *testing.T) {
+func TestNtpIsOffsetTooLarge(t *testing.T) {
 	maxOffset, _ := utils.ParseDurationString("1s")
 	assert.True(t, ntpIsOffsetTooLarge(maxOffset, time.Now(), time.Now().Add(time.Second*2)))
+	assert.True(t, ntpIsOffsetTooLarge(maxOffset, time.Now().Add(time.Second*2), time.Now()))
 	assert.False(t, ntpIsOffsetTooLarge(maxOffset, time.Now(), time.Now()))
 }
+
+func TestNtpPacketToTime(t *testing.T) {
+	resp := &ntpPacket{
+		TxTimeSeconds:  60,
+		TxTimeFraction: 0,
+	}
+
+	expected := time.Unix(int64(float64(60)-ntpEpochOffset), 0)
+
+	ntpTime := ntpPacketToTime(resp)
+	assert.Equal(t, expected, ntpTime)
+}
+
+func TestLeapVersionClientMode(t *testing.T) {
+	v3Noleap := uint8(27)
+	v4Noleap := uint8(43)
+	v3leap := uint8(91)
+	v4leap := uint8(107)
+
+	assert.Equal(t, v3Noleap, ntpLeapVersionClientMode(false, ntpV3))
+	assert.Equal(t, v4Noleap, ntpLeapVersionClientMode(false, ntpV4))
+	assert.Equal(t, v3leap, ntpLeapVersionClientMode(true, ntpV3))
+	assert.Equal(t, v4leap, ntpLeapVersionClientMode(true, ntpV4))
+}
diff --git a/internal/oidc/client.go b/internal/oidc/client.go
index 61bce5590..633161bc6 100644
--- a/internal/oidc/client.go
+++ b/internal/oidc/client.go
@@ -1,7 +1,10 @@
 package oidc
 
 import (
+	"fmt"
+
 	"github.com/ory/fosite"
+	"github.com/ory/x/errorsx"
 
 	"github.com/authelia/authelia/v4/internal/authentication"
 	"github.com/authelia/authelia/v4/internal/authorization"
@@ -18,6 +21,10 @@ func NewClient(config schema.OpenIDConnectClientConfiguration) (client *Client)
 		SectorIdentifier: config.SectorIdentifier.String(),
 		Public:           config.Public,
 
+		EnforcePKCE:                config.EnforcePKCE || config.PKCEChallengeMethod != "",
+		EnforcePKCEChallengeMethod: config.PKCEChallengeMethod != "",
+		PKCEChallengeMethod:        config.PKCEChallengeMethod,
+
 		Audience:      config.Audience,
 		Scopes:        config.Scopes,
 		RedirectURIs:  config.RedirectURIs,
@@ -39,6 +46,29 @@ func NewClient(config schema.OpenIDConnectClientConfiguration) (client *Client)
 	return client
 }
 
+// ValidateAuthorizationPolicy is a helper function to validate additional policy constraints on a per-client basis.
+func (c *Client) ValidateAuthorizationPolicy(r fosite.Requester) (err error) {
+	form := r.GetRequestForm()
+
+	if c.EnforcePKCE {
+		if form.Get("code_challenge") == "" {
+			return errorsx.WithStack(fosite.ErrInvalidRequest.
+				WithHint("Clients must include a code_challenge when performing the authorize code flow, but it is missing.").
+				WithDebug("The server is configured in a way that enforces PKCE for this client."))
+		}
+
+		if c.EnforcePKCEChallengeMethod {
+			if method := form.Get("code_challenge_method"); method != c.PKCEChallengeMethod {
+				return errorsx.WithStack(fosite.ErrInvalidRequest.
+					WithHint(fmt.Sprintf("Client must use code_challenge_method=%s, %s is not allowed.", c.PKCEChallengeMethod, method)).
+					WithDebug(fmt.Sprintf("The server is configured in a way that enforces PKCE %s as challenge method for this client.", c.PKCEChallengeMethod)))
+			}
+		}
+	}
+
+	return nil
+}
+
 // IsAuthenticationLevelSufficient returns if the provided authentication.Level is sufficient for the client of the AutheliaClient.
 func (c *Client) IsAuthenticationLevelSufficient(level authentication.Level) bool {
 	if level == authentication.NotAuthenticated {
@@ -48,11 +78,6 @@ func (c *Client) IsAuthenticationLevelSufficient(level authentication.Level) boo
 	return authorization.IsAuthLevelSufficient(level, c.Policy)
 }
 
-// GetID returns the ID.
-func (c *Client) GetID() string {
-	return c.ID
-}
-
 // GetSectorIdentifier returns the SectorIdentifier for this client.
 func (c *Client) GetSectorIdentifier() string {
 	return c.SectorIdentifier
@@ -74,6 +99,11 @@ func (c *Client) GetConsentResponseBody(consent *model.OAuth2ConsentSession) Con
 	return body
 }
 
+// GetID returns the ID.
+func (c *Client) GetID() string {
+	return c.ID
+}
+
 // GetHashedSecret returns the Secret.
 func (c *Client) GetHashedSecret() []byte {
 	if c.Secret == nil {
diff --git a/internal/oidc/client_test.go b/internal/oidc/client_test.go
index 1f1a7b860..23b53aaec 100644
--- a/internal/oidc/client_test.go
+++ b/internal/oidc/client_test.go
@@ -217,6 +217,90 @@ func TestClient_GetResponseTypes(t *testing.T) {
 	assert.Equal(t, "id_token", responseTypes[1])
 }
 
+func TestNewClientPKCE(t *testing.T) {
+	testCases := []struct {
+		name                               string
+		have                               schema.OpenIDConnectClientConfiguration
+		expectedEnforcePKCE                bool
+		expectedEnforcePKCEChallengeMethod bool
+		expected                           string
+		req                                *fosite.Request
+		err                                string
+	}{
+		{
+			"ShouldNotEnforcePKCEAndNotErrorOnNonPKCERequest",
+			schema.OpenIDConnectClientConfiguration{},
+			false,
+			false,
+			"",
+			&fosite.Request{},
+			"",
+		},
+		{
+			"ShouldEnforcePKCEAndErrorOnNonPKCERequest",
+			schema.OpenIDConnectClientConfiguration{EnforcePKCE: true},
+			true,
+			false,
+			"",
+			&fosite.Request{},
+			"invalid_request",
+		},
+		{
+			"ShouldEnforcePKCEAndNotErrorOnPKCERequest",
+			schema.OpenIDConnectClientConfiguration{EnforcePKCE: true},
+			true,
+			false,
+			"",
+			&fosite.Request{Form: map[string][]string{"code_challenge": {"abc"}}},
+			"",
+		},
+		{"ShouldEnforcePKCEFromChallengeMethodAndErrorOnNonPKCERequest",
+			schema.OpenIDConnectClientConfiguration{PKCEChallengeMethod: "S256"},
+			true,
+			true,
+			"S256",
+			&fosite.Request{},
+			"invalid_request",
+		},
+		{"ShouldEnforcePKCEFromChallengeMethodAndErrorOnInvalidChallengeMethod",
+			schema.OpenIDConnectClientConfiguration{PKCEChallengeMethod: "S256"},
+			true,
+			true,
+			"S256",
+			&fosite.Request{Form: map[string][]string{"code_challenge": {"abc"}}},
+			"invalid_request",
+		},
+		{"ShouldEnforcePKCEFromChallengeMethodAndNotErrorOnValidRequest",
+			schema.OpenIDConnectClientConfiguration{PKCEChallengeMethod: "S256"},
+			true,
+			true,
+			"S256",
+			&fosite.Request{Form: map[string][]string{"code_challenge": {"abc"}, "code_challenge_method": {"S256"}}},
+			"",
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			client := NewClient(tc.have)
+
+			assert.Equal(t, tc.expectedEnforcePKCE, client.EnforcePKCE)
+			assert.Equal(t, tc.expectedEnforcePKCEChallengeMethod, client.EnforcePKCEChallengeMethod)
+			assert.Equal(t, tc.expected, client.PKCEChallengeMethod)
+
+			if tc.req != nil {
+				err := client.ValidateAuthorizationPolicy(tc.req)
+
+				if tc.err != "" {
+					assert.EqualError(t, err, tc.err)
+				} else {
+					assert.NoError(t, err)
+				}
+			}
+		})
+	}
+}
+
 func TestClient_IsPublic(t *testing.T) {
 	c := Client{}
 
diff --git a/internal/oidc/config.go b/internal/oidc/config.go
index 7da84d4ef..0146899bf 100644
--- a/internal/oidc/config.go
+++ b/internal/oidc/config.go
@@ -40,11 +40,10 @@ func NewConfig(config *schema.OpenIDConnectConfiguration) *Config {
 		},
 	}
 
-	prefix := "authelia_%s_"
 	c.Strategy.Core = &HMACCoreStrategy{
 		Enigma: &hmac.HMACStrategy{Config: c},
 		Config: c,
-		prefix: &prefix,
+		prefix: tokenPrefixFmt,
 	}
 
 	return c
diff --git a/internal/oidc/const.go b/internal/oidc/const.go
index 91647013e..9c8fa6942 100644
--- a/internal/oidc/const.go
+++ b/internal/oidc/const.go
@@ -106,6 +106,13 @@ const (
 	JWTHeaderKeyIdentifier = "kid"
 )
 
+const (
+	tokenPrefixFmt               = "authelia_%s_" //nolint:gosec
+	tokenPrefixPartAccessToken   = "at"
+	tokenPrefixPartRefreshToken  = "rt"
+	tokenPrefixPartAuthorizeCode = "ac"
+)
+
 // Paths.
 const (
 	EndpointPathConsent                           = "/consent"
diff --git a/internal/oidc/hmac.go b/internal/oidc/hmac.go
index 976ddec07..979a98afc 100644
--- a/internal/oidc/hmac.go
+++ b/internal/oidc/hmac.go
@@ -19,7 +19,7 @@ type HMACCoreStrategy struct {
 		fosite.RefreshTokenLifespanProvider
 		fosite.AuthorizeCodeLifespanProvider
 	}
-	prefix *string
+	prefix string
 }
 
 // AccessTokenSignature implements oauth2.AccessTokenStrategy.
@@ -34,7 +34,7 @@ func (h *HMACCoreStrategy) GenerateAccessToken(ctx context.Context, _ fosite.Req
 		return "", "", err
 	}
 
-	return h.setPrefix(token, "at"), sig, nil
+	return h.setPrefix(token, tokenPrefixPartAccessToken), sig, nil
 }
 
 // ValidateAccessToken implements oauth2.AccessTokenStrategy.
@@ -48,7 +48,7 @@ func (h *HMACCoreStrategy) ValidateAccessToken(ctx context.Context, r fosite.Req
 		return errorsx.WithStack(fosite.ErrTokenExpired.WithHintf("Access token expired at '%s'.", exp))
 	}
 
-	return h.Enigma.Validate(ctx, h.trimPrefix(token, "at"))
+	return h.Enigma.Validate(ctx, h.trimPrefix(token, tokenPrefixPartAccessToken))
 }
 
 // RefreshTokenSignature implements oauth2.RefreshTokenStrategy.
@@ -63,21 +63,22 @@ func (h *HMACCoreStrategy) GenerateRefreshToken(ctx context.Context, _ fosite.Re
 		return "", "", err
 	}
 
-	return h.setPrefix(token, "rt"), sig, nil
+	return h.setPrefix(token, tokenPrefixPartRefreshToken), sig, nil
 }
 
 // ValidateRefreshToken implements oauth2.RefreshTokenStrategy.
 func (h *HMACCoreStrategy) ValidateRefreshToken(ctx context.Context, r fosite.Requester, token string) (err error) {
 	var exp = r.GetSession().GetExpiresAt(fosite.RefreshToken)
+
 	if exp.IsZero() {
-		return h.Enigma.Validate(ctx, h.trimPrefix(token, "rt"))
+		return h.Enigma.Validate(ctx, h.trimPrefix(token, tokenPrefixPartRefreshToken))
 	}
 
-	if !exp.IsZero() && exp.Before(time.Now().UTC()) {
+	if exp.Before(time.Now().UTC()) {
 		return errorsx.WithStack(fosite.ErrTokenExpired.WithHintf("Refresh token expired at '%s'.", exp))
 	}
 
-	return h.Enigma.Validate(ctx, h.trimPrefix(token, "rt"))
+	return h.Enigma.Validate(ctx, h.trimPrefix(token, tokenPrefixPartRefreshToken))
 }
 
 // AuthorizeCodeSignature implements oauth2.AuthorizeCodeStrategy.
@@ -92,12 +93,13 @@ func (h *HMACCoreStrategy) GenerateAuthorizeCode(ctx context.Context, _ fosite.R
 		return "", "", err
 	}
 
-	return h.setPrefix(token, "ac"), sig, nil
+	return h.setPrefix(token, tokenPrefixPartAuthorizeCode), sig, nil
 }
 
 // ValidateAuthorizeCode implements oauth2.AuthorizeCodeStrategy.
 func (h *HMACCoreStrategy) ValidateAuthorizeCode(ctx context.Context, r fosite.Requester, token string) (err error) {
 	var exp = r.GetSession().GetExpiresAt(fosite.AuthorizeCode)
+
 	if exp.IsZero() && r.GetRequestedAt().Add(h.Config.GetAuthorizeCodeLifespan(ctx)).Before(time.Now().UTC()) {
 		return errorsx.WithStack(fosite.ErrTokenExpired.WithHintf("Authorize code expired at '%s'.", r.GetRequestedAt().Add(h.Config.GetAuthorizeCodeLifespan(ctx))))
 	}
@@ -106,24 +108,21 @@ func (h *HMACCoreStrategy) ValidateAuthorizeCode(ctx context.Context, r fosite.R
 		return errorsx.WithStack(fosite.ErrTokenExpired.WithHintf("Authorize code expired at '%s'.", exp))
 	}
 
-	return h.Enigma.Validate(ctx, h.trimPrefix(token, "ac"))
+	return h.Enigma.Validate(ctx, h.trimPrefix(token, tokenPrefixPartAuthorizeCode))
 }
 
 func (h *HMACCoreStrategy) getPrefix(part string) string {
-	if h.prefix == nil {
-		prefix := "ory_%s_"
-		h.prefix = &prefix
-	} else if len(*h.prefix) == 0 {
+	if len(h.prefix) == 0 {
 		return ""
 	}
 
-	return fmt.Sprintf(*h.prefix, part)
-}
-
-func (h *HMACCoreStrategy) trimPrefix(token, part string) string {
-	return strings.TrimPrefix(token, h.getPrefix(part))
+	return fmt.Sprintf(h.prefix, part)
 }
 
 func (h *HMACCoreStrategy) setPrefix(token, part string) string {
 	return h.getPrefix(part) + token
 }
+
+func (h *HMACCoreStrategy) trimPrefix(token, part string) string {
+	return strings.TrimPrefix(token, h.getPrefix(part))
+}
diff --git a/internal/oidc/types.go b/internal/oidc/types.go
index 58328d119..d2782220c 100644
--- a/internal/oidc/types.go
+++ b/internal/oidc/types.go
@@ -107,6 +107,10 @@ type Client struct {
 	SectorIdentifier string
 	Public           bool
 
+	EnforcePKCE                bool
+	EnforcePKCEChallengeMethod bool
+	PKCEChallengeMethod        string
+
 	Audience      []string
 	Scopes        []string
 	RedirectURIs  []string
diff --git a/internal/random/const.go b/internal/random/const.go
new file mode 100644
index 000000000..4a171f17f
--- /dev/null
+++ b/internal/random/const.go
@@ -0,0 +1,43 @@
+package random
+
+const (
+	// DefaultN is the default value of n.
+	DefaultN = 72
+)
+
+const (
+	// CharSetAlphabeticLower are literally just valid alphabetic lowercase printable ASCII chars.
+	CharSetAlphabeticLower = "abcdefghijklmnopqrstuvwxyz"
+
+	// CharSetAlphabeticUpper are literally just valid alphabetic uppercase printable ASCII chars.
+	CharSetAlphabeticUpper = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+
+	// CharSetAlphabetic are literally just valid alphabetic printable ASCII chars.
+	CharSetAlphabetic = CharSetAlphabeticLower + CharSetAlphabeticUpper
+
+	// CharSetNumeric are literally just valid numeric chars.
+	CharSetNumeric = "0123456789"
+
+	// CharSetNumericHex are literally just valid hexadecimal printable ASCII chars.
+	CharSetNumericHex = CharSetNumeric + "ABCDEF"
+
+	// CharSetSymbolic are literally just valid symbolic printable ASCII chars.
+	CharSetSymbolic = "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~"
+
+	// CharSetSymbolicRFC3986Unreserved are RFC3986 unreserved symbol characters.
+	// See https://www.rfc-editor.org/rfc/rfc3986#section-2.3.
+	CharSetSymbolicRFC3986Unreserved = "-._~"
+
+	// CharSetAlphaNumeric are literally just valid alphanumeric printable ASCII chars.
+	CharSetAlphaNumeric = CharSetAlphabetic + CharSetNumeric
+
+	// CharSetASCII are literally just valid printable ASCII chars.
+	CharSetASCII = CharSetAlphabetic + CharSetNumeric + CharSetSymbolic
+
+	// CharSetRFC3986Unreserved are RFC3986 unreserved characters.
+	// See https://www.rfc-editor.org/rfc/rfc3986#section-2.3.
+	CharSetRFC3986Unreserved = CharSetAlphabetic + CharSetNumeric + CharSetSymbolicRFC3986Unreserved
+
+	// CharSetUnambiguousUpper  are a set of unambiguous uppercase characters.
+	CharSetUnambiguousUpper = "ABCDEFGHJKLMNOPQRTUVWYXZ2346789"
+)
diff --git a/internal/random/crypto.go b/internal/random/crypto.go
new file mode 100644
index 000000000..bff1e0dce
--- /dev/null
+++ b/internal/random/crypto.go
@@ -0,0 +1,136 @@
+package random
+
+import (
+	"crypto/rand"
+	"fmt"
+	"io"
+	"math/big"
+)
+
+// Cryptographical is the production random.Provider which uses crypto/rand.
+type Cryptographical struct{}
+
+// Read implements the io.Reader interface.
+func (r *Cryptographical) Read(p []byte) (n int, err error) {
+	return io.ReadFull(rand.Reader, p)
+}
+
+// BytesErr returns random data as bytes with the standard random.DefaultN length and can contain any byte values
+// (including unreadable byte values). If an error is returned from the random read this function returns it.
+func (r *Cryptographical) BytesErr() (data []byte, err error) {
+	data = make([]byte, DefaultN)
+
+	_, err = rand.Read(data)
+
+	return data, err
+}
+
+// Bytes returns random data as bytes with the standard random.DefaultN length and can contain any byte values
+// (including unreadable byte values). If an error is returned from the random read this function ignores it.
+func (r *Cryptographical) Bytes() (data []byte) {
+	data, _ = r.BytesErr()
+
+	return data
+}
+
+// BytesCustomErr returns random data as bytes with n length and can contain only byte values from the provided
+// values. If n is less than 1 then DefaultN is used instead. If an error is returned from the random read this function
+// returns it.
+func (r *Cryptographical) BytesCustomErr(n int, charset []byte) (data []byte, err error) {
+	if n < 1 {
+		n = DefaultN
+	}
+
+	data = make([]byte, n)
+
+	if _, err = rand.Read(data); err != nil {
+		return nil, err
+	}
+
+	t := len(charset)
+
+	for i := 0; i < n; i++ {
+		data[i] = charset[data[i]%byte(t)]
+	}
+
+	return data, nil
+}
+
+// StringCustomErr is an overload of BytesCustomWithErr which takes a characters string and returns a string.
+func (r *Cryptographical) StringCustomErr(n int, characters string) (data string, err error) {
+	var d []byte
+
+	if d, err = r.BytesCustomErr(n, []byte(characters)); err != nil {
+		return "", err
+	}
+
+	return string(d), nil
+}
+
+// BytesCustom returns random data as bytes with n length and can contain only byte values from the provided values.
+// If n is less than 1 then DefaultN is used instead. If an error is returned from the random read this function
+// ignores it.
+func (r *Cryptographical) BytesCustom(n int, charset []byte) (data []byte) {
+	data, _ = r.BytesCustomErr(n, charset)
+
+	return data
+}
+
+// StringCustom is an overload of BytesCustom which takes a characters string and returns a string.
+func (r *Cryptographical) StringCustom(n int, characters string) (data string) {
+	return string(r.BytesCustom(n, []byte(characters)))
+}
+
+// IntErr returns a random *big.Int error combination with a maximum of max.
+func (r *Cryptographical) IntErr(max *big.Int) (value *big.Int, err error) {
+	if max == nil {
+		return nil, fmt.Errorf("max is required")
+	}
+
+	if max.Sign() <= 0 {
+		return nil, fmt.Errorf("max must be 1 or more")
+	}
+
+	return rand.Int(rand.Reader, max)
+}
+
+// Int returns a random *big.Int with a maximum of max.
+func (r *Cryptographical) Int(max *big.Int) (value *big.Int) {
+	var err error
+
+	if value, err = r.IntErr(max); err != nil {
+		return big.NewInt(-1)
+	}
+
+	return value
+}
+
+// IntegerErr returns a random int error combination with a maximum of n.
+func (r *Cryptographical) IntegerErr(n int) (value int, err error) {
+	if n <= 0 {
+		return 0, fmt.Errorf("n must be more than 0")
+	}
+
+	max := big.NewInt(int64(n))
+
+	var result *big.Int
+
+	if result, err = r.IntErr(max); err != nil {
+		return 0, err
+	}
+
+	value = int(result.Int64())
+
+	if value < 0 {
+		return 0, fmt.Errorf("generated number is too big for int")
+	}
+
+	return value, nil
+}
+
+// Integer returns a random int with a maximum of n.
+func (r *Cryptographical) Integer(n int) (value int) {
+	value, _ = r.IntegerErr(n)
+
+	return value
+}
diff --git a/internal/random/math.go b/internal/random/math.go
new file mode 100644
index 000000000..d95a2d7f7
--- /dev/null
+++ b/internal/random/math.go
@@ -0,0 +1,126 @@
+package random
+
+import (
+	"fmt"
+	"math/big"
+	"math/rand"
+	"time"
+)
+
+// NewMathematical runs rand.Seed with the current time and returns a random.Provider, specifically *random.Mathematical.
+func NewMathematical() *Mathematical {
+	rand.Seed(time.Now().UnixNano())
+
+	return &Mathematical{}
+}
+
+// Mathematical is the random.Provider which uses math/rand and is COMPLETELY UNSAFE FOR PRODUCTION IN MOST SITUATIONS.
+// Use random.Cryptographical instead.
+type Mathematical struct{}
+
+// Read implements the io.Reader interface.
+func (r *Mathematical) Read(p []byte) (n int, err error) {
+	return rand.Read(p) //nolint:gosec
+}
+
+// BytesErr returns random data as bytes with the standard random.DefaultN length and can contain any byte values
+// (including unreadable byte values). If an error is returned from the random read this function returns it.
+func (r *Mathematical) BytesErr() (data []byte, err error) {
+	data = make([]byte, DefaultN)
+
+	if _, err = rand.Read(data); err != nil { //nolint:gosec
+		return nil, err
+	}
+
+	return data, nil
+}
+
+// Bytes returns random data as bytes with the standard random.DefaultN length and can contain any byte values
+// (including unreadable byte values). If an error is returned from the random read this function ignores it.
+func (r *Mathematical) Bytes() (data []byte) {
+	data, _ = r.BytesErr()
+
+	return data
+}
+
+// BytesCustomErr returns random data as bytes with n length and can contain only byte values from the provided
+// values. If n is less than 1 then DefaultN is used instead. If an error is returned from the random read this function
+// returns it.
+func (r *Mathematical) BytesCustomErr(n int, charset []byte) (data []byte, err error) {
+	if n < 1 {
+		n = DefaultN
+	}
+
+	data = make([]byte, n)
+
+	if _, err = rand.Read(data); err != nil { //nolint:gosec
+		return nil, err
+	}
+
+	t := len(charset)
+
+	for i := 0; i < n; i++ {
+		data[i] = charset[data[i]%byte(t)]
+	}
+
+	return data, nil
+}
+
+// StringCustomErr is an overload of BytesCustomWithErr which takes a characters string and returns a string.
+func (r *Mathematical) StringCustomErr(n int, characters string) (data string, err error) {
+	var d []byte
+
+	if d, err = r.BytesCustomErr(n, []byte(characters)); err != nil {
+		return "", err
+	}
+
+	return string(d), nil
+}
+
+// BytesCustom returns random data as bytes with n length and can contain only byte values from the provided values.
+// If n is less than 1 then DefaultN is used instead. If an error is returned from the random read this function
+// ignores it.
+func (r *Mathematical) BytesCustom(n int, charset []byte) (data []byte) {
+	data, _ = r.BytesCustomErr(n, charset)
+
+	return data
+}
+
+// StringCustom is an overload of BytesCustom which takes a characters string and returns a string.
+func (r *Mathematical) StringCustom(n int, characters string) (data string) {
+	return string(r.BytesCustom(n, []byte(characters)))
+}
+
+// IntErr returns a random *big.Int error combination with a maximum of max.
+func (r *Mathematical) IntErr(max *big.Int) (value *big.Int, err error) {
+	if max == nil {
+		return nil, fmt.Errorf("max is required")
+	}
+
+	if max.Sign() <= 0 {
+		return nil, fmt.Errorf("max must be 1 or more")
+	}
+
+	return big.NewInt(int64(rand.Intn(max.Sign()))), nil //nolint:gosec
+}
+
+// Int returns a random *big.Int with a maximum of max.
+func (r *Mathematical) Int(max *big.Int) (value *big.Int) {
+	var err error
+
+	if value, err = r.IntErr(max); err != nil {
+		return big.NewInt(-1)
+	}
+
+	return value
+}
+
+// IntegerErr returns a random int error combination with a maximum of n.
+func (r *Mathematical) IntegerErr(n int) (output int, err error) {
+	return r.Integer(n), nil
+}
+
+// Integer returns a random int with a maximum of n.
+func (r *Mathematical) Integer(n int) int {
+	return rand.Intn(n) //nolint:gosec
+}
diff --git a/internal/random/provider.go b/internal/random/provider.go
new file mode 100644
index 000000000..7eeda72ab
--- /dev/null
+++ b/internal/random/provider.go
@@ -0,0 +1,46 @@
+package random
+
+import (
+	"io"
+	"math/big"
+)
+
+// Provider of random functions and functionality.
+type Provider interface {
+	io.Reader
+
+	// BytesErr returns random data as bytes with the standard random.DefaultN length and can contain any byte values
+	// (including unreadable byte values). If an error is returned from the random read this function returns it.
+	BytesErr() (data []byte, err error)
+
+	// Bytes returns random data as bytes with the standard random.DefaultN length and can contain any byte values
+	// (including unreadable byte values). If an error is returned from the random read this function ignores it.
+	Bytes() (data []byte)
+
+	// BytesCustomErr returns random data as bytes with n length and can contain only byte values from the provided
+	// values. If n is less than 1 then DefaultN is used instead. If an error is returned from the random read this function
+	// returns it.
+	BytesCustomErr(n int, charset []byte) (data []byte, err error)
+
+	// StringCustomErr is an overload of BytesCustomWithErr which takes a characters string and returns a string.
+	StringCustomErr(n int, characters string) (data string, err error)
+
+	// BytesCustom returns random data as bytes with n length and can contain only byte values from the provided
+	// values. If n is less than 1 then DefaultN is used instead.
+	BytesCustom(n int, charset []byte) (data []byte)
+
+	// StringCustom is an overload of GenerateCustom which takes a characters string and returns a string.
+	StringCustom(n int, characters string) (data string)
+
+	// IntErr returns a random *big.Int error combination with a maximum of max.
+	IntErr(max *big.Int) (value *big.Int, err error)
+
+	// Int returns a random *big.Int with a maximum of max.
+	Int(max *big.Int) (value *big.Int)
+
+	// IntegerErr returns a random int error combination with a maximum of n.
+	IntegerErr(n int) (value int, err error)
+
+	// Integer returns a random integer with a maximum of n.
+	Integer(n int) (value int)
+}
diff --git a/internal/server/const.go b/internal/server/const.go
index d07c355e8..d4842f152 100644
--- a/internal/server/const.go
+++ b/internal/server/const.go
@@ -5,15 +5,13 @@ import (
 )
 
 const (
-	assetsRoot    = "public_html"
-	assetsSwagger = assetsRoot + "/api"
+	assetsRoot = "public_html"
 
-	fileOpenAPI   = "openapi.yml"
-	fileIndexHTML = "index.html"
-	fileLogo      = "logo.png"
+	fileLogo = "logo.png"
 
 	extHTML = ".html"
 	extJSON = ".json"
+	extYML  = ".yml"
 )
 
 var (
@@ -52,8 +50,8 @@ var (
 const (
 	environment = "ENVIRONMENT"
 	dev         = "dev"
-	f           = "false"
-	t           = "true"
+	strFalse    = "false"
+	strTrue     = "true"
 	localhost   = "localhost"
 	schemeHTTP  = "http"
 	schemeHTTPS = "https"
@@ -76,7 +74,8 @@ X_AUTHELIA_HEALTHCHECK_PATH=%s
 `
 
 const (
-	tmplCSPSwagger = "default-src 'self'; img-src 'self' https://validator.swagger.io data:; object-src 'none'; script-src 'self' 'unsafe-inline' 'nonce-%s'; style-src 'self' 'nonce-%s'; base-uri 'self'"
+	tmplCSPSwaggerNonce = "default-src 'self'; img-src 'self' https://validator.swagger.io data:; object-src 'none'; script-src 'self' 'unsafe-inline' 'nonce-%s'; style-src 'self' 'nonce-%s'; base-uri 'self'"
+	tmplCSPSwagger      = "default-src 'self'; img-src 'self' https://validator.swagger.io data:; object-src 'none'; script-src 'self' 'unsafe-inline'; style-src 'self'; base-uri 'self'"
 )
 
 const (
diff --git a/internal/server/handlers.go b/internal/server/handlers.go
index 0620f44fa..032f54a7f 100644
--- a/internal/server/handlers.go
+++ b/internal/server/handlers.go
@@ -93,9 +93,9 @@ func handleNotFound(next fasthttp.RequestHandler) fasthttp.RequestHandler {
 func handleRouter(config schema.Configuration, providers middlewares.Providers) fasthttp.RequestHandler {
 	optsTemplatedFile := NewTemplatedFileOptions(&config)
 
-	serveIndexHandler := ServeTemplatedFile(assetsRoot, fileIndexHTML, optsTemplatedFile)
-	serveSwaggerHandler := ServeTemplatedFile(assetsSwagger, fileIndexHTML, optsTemplatedFile)
-	serveSwaggerAPIHandler := ServeTemplatedFile(assetsSwagger, fileOpenAPI, optsTemplatedFile)
+	serveIndexHandler := ServeTemplatedFile(providers.Templates.GetAssetIndexTemplate(), optsTemplatedFile)
+	serveOpenAPIHandler := ServeTemplatedOpenAPI(providers.Templates.GetAssetOpenAPIIndexTemplate(), optsTemplatedFile)
+	serveOpenAPISpecHandler := ETagRootURL(ServeTemplatedOpenAPI(providers.Templates.GetAssetOpenAPISpecTemplate(), optsTemplatedFile))
 
 	handlerPublicHTML := newPublicHTMLEmbeddedHandler()
 	handlerLocales := newLocalesEmbeddedHandler()
@@ -126,10 +126,12 @@ func handleRouter(config schema.Configuration, providers middlewares.Providers)
 	r.GET("/locales/{language:[a-z]{1,3}}/{namespace:[a-z]+}.json", middlewares.AssetOverride(config.Server.AssetPath, 0, handlerLocales))
 
 	// Swagger.
-	r.GET("/api/", middleware(serveSwaggerHandler))
+	r.GET("/api/", middleware(serveOpenAPIHandler))
 	r.OPTIONS("/api/", policyCORSPublicGET.HandleOPTIONS)
-	r.GET("/api/"+fileOpenAPI, policyCORSPublicGET.Middleware(middleware(serveSwaggerAPIHandler)))
-	r.OPTIONS("/api/"+fileOpenAPI, policyCORSPublicGET.HandleOPTIONS)
+	r.GET("/api/index.html", middleware(serveOpenAPIHandler))
+	r.OPTIONS("/api/index.html", policyCORSPublicGET.HandleOPTIONS)
+	r.GET("/api/openapi.yml", policyCORSPublicGET.Middleware(middleware(serveOpenAPISpecHandler)))
+	r.OPTIONS("/api/openapi.yml", policyCORSPublicGET.HandleOPTIONS)
 
 	for _, file := range filesSwagger {
 		r.GET("/api/"+file, handlerPublicHTML)
diff --git a/internal/server/server.go b/internal/server/server.go
index 760cbe50e..319c708bc 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -19,6 +19,10 @@ import (
 
 // CreateDefaultServer Create Authelia's internal webserver with the given configuration and providers.
 func CreateDefaultServer(config schema.Configuration, providers middlewares.Providers) (server *fasthttp.Server, listener net.Listener, err error) {
+	if err = providers.Templates.LoadTemplatedAssets(assets); err != nil {
+		return nil, nil, fmt.Errorf("failed to load templated assets: %w", err)
+	}
+
 	server = &fasthttp.Server{
 		ErrorHandler:          handleError(),
 		Handler:               handleRouter(config, providers),
diff --git a/internal/server/server_test.go b/internal/server/server_test.go
index d7f62ff43..dd87678e5 100644
--- a/internal/server/server_test.go
+++ b/internal/server/server_test.go
@@ -21,6 +21,7 @@ import (
 	"github.com/authelia/authelia/v4/internal/configuration/schema"
 	"github.com/authelia/authelia/v4/internal/logging"
 	"github.com/authelia/authelia/v4/internal/middlewares"
+	"github.com/authelia/authelia/v4/internal/templates"
 	"github.com/authelia/authelia/v4/internal/utils"
 )
 
@@ -134,10 +135,17 @@ type TLSServerContext struct {
 	port   int
 }
 
-func NewTLSServerContext(configuration schema.Configuration) (*TLSServerContext, error) {
-	serverContext := new(TLSServerContext)
+func NewTLSServerContext(configuration schema.Configuration) (serverContext *TLSServerContext, err error) {
+	serverContext = new(TLSServerContext)
 
-	s, listener, err := CreateDefaultServer(configuration, middlewares.Providers{})
+	providers := middlewares.Providers{}
+
+	providers.Templates, err = templates.New(templates.Config{EmailTemplatesPath: configuration.Notifier.TemplatePath})
+	if err != nil {
+		return nil, err
+	}
+
+	s, listener, err := CreateDefaultServer(configuration, providers)
 
 	if err != nil {
 		return nil, err
diff --git a/internal/server/template.go b/internal/server/template.go
index d86841005..2aa24560d 100644
--- a/internal/server/template.go
+++ b/internal/server/template.go
@@ -1,56 +1,43 @@
 package server
 
 import (
+	"bytes"
+	"crypto/sha1" //nolint:gosec
+	"encoding/hex"
 	"fmt"
-	"io"
 	"os"
-	"path"
 	"path/filepath"
 	"strconv"
 	"strings"
-	"text/template"
+	"sync"
 
 	"github.com/valyala/fasthttp"
 
 	"github.com/authelia/authelia/v4/internal/configuration/schema"
-	"github.com/authelia/authelia/v4/internal/logging"
 	"github.com/authelia/authelia/v4/internal/middlewares"
-	"github.com/authelia/authelia/v4/internal/utils"
+	"github.com/authelia/authelia/v4/internal/random"
+	"github.com/authelia/authelia/v4/internal/templates"
 )
 
 // ServeTemplatedFile serves a templated version of a specified file,
 // this is utilised to pass information between the backend and frontend
 // and generate a nonce to support a restrictive CSP while using material-ui.
-func ServeTemplatedFile(publicDir, file string, opts *TemplatedFileOptions) middlewares.RequestHandler {
-	logger := logging.Logger()
-
-	a, err := assets.Open(path.Join(publicDir, file))
-	if err != nil {
-		logger.Fatalf("Unable to open %s: %s", file, err)
-	}
-
-	b, err := io.ReadAll(a)
-	if err != nil {
-		logger.Fatalf("Unable to read %s: %s", file, err)
-	}
-
-	tmpl, err := template.New("file").Parse(string(b))
-	if err != nil {
-		logger.Fatalf("Unable to parse %s template: %s", file, err)
-	}
-
+func ServeTemplatedFile(t templates.Template, opts *TemplatedFileOptions) middlewares.RequestHandler {
 	isDevEnvironment := os.Getenv(environment) == dev
+	ext := filepath.Ext(t.Name())
 
 	return func(ctx *middlewares.AutheliaCtx) {
-		logoOverride := f
+		var err error
+
+		logoOverride := strFalse
 
 		if opts.AssetPath != "" {
 			if _, err = os.Stat(filepath.Join(opts.AssetPath, fileLogo)); err == nil {
-				logoOverride = t
+				logoOverride = strTrue
 			}
 		}
 
-		switch extension := filepath.Ext(file); extension {
+		switch ext {
 		case extHTML:
 			ctx.SetContentTypeTextHTML()
 		case extJSON:
@@ -59,11 +46,9 @@ func ServeTemplatedFile(publicDir, file string, opts *TemplatedFileOptions) midd
 			ctx.SetContentTypeTextPlain()
 		}
 
-		nonce := utils.RandomString(32, utils.CharSetAlphaNumeric)
+		nonce := ctx.Providers.Random.StringCustom(32, random.CharSetAlphaNumeric)
 
 		switch {
-		case publicDir == assetsSwagger:
-			ctx.Response.Header.Add(fasthttp.HeaderContentSecurityPolicy, fmt.Sprintf(tmplCSPSwagger, nonce, nonce))
 		case ctx.Configuration.Server.Headers.CSPTemplate != "":
 			ctx.Response.Header.Add(fasthttp.HeaderContentSecurityPolicy, strings.ReplaceAll(ctx.Configuration.Server.Headers.CSPTemplate, placeholderCSPNonce, nonce))
 		case isDevEnvironment:
@@ -72,15 +57,99 @@ func ServeTemplatedFile(publicDir, file string, opts *TemplatedFileOptions) midd
 			ctx.Response.Header.Add(fasthttp.HeaderContentSecurityPolicy, fmt.Sprintf(tmplCSPDefault, nonce))
 		}
 
-		if err = tmpl.Execute(ctx.Response.BodyWriter(), opts.CommonData(ctx.BasePath(), ctx.RootURLSlash().String(), nonce, logoOverride)); err != nil {
+		if err = t.Execute(ctx.Response.BodyWriter(), opts.CommonData(ctx.BasePath(), ctx.RootURLSlash().String(), nonce, logoOverride)); err != nil {
 			ctx.RequestCtx.Error("an error occurred", 503)
-			logger.Errorf("Unable to execute template: %v", err)
+			ctx.Logger.WithError(err).Errorf("Error occcurred rendering template")
 
 			return
 		}
 	}
 }
 
+// ServeTemplatedOpenAPI serves templated OpenAPI related files.
+func ServeTemplatedOpenAPI(t templates.Template, opts *TemplatedFileOptions) middlewares.RequestHandler {
+	ext := filepath.Ext(t.Name())
+
+	spec := ext == extYML
+
+	return func(ctx *middlewares.AutheliaCtx) {
+		var nonce string
+
+		if spec {
+			ctx.Response.Header.Add(fasthttp.HeaderContentSecurityPolicy, tmplCSPSwagger)
+		} else {
+			nonce = ctx.Providers.Random.StringCustom(32, random.CharSetAlphaNumeric)
+			ctx.Response.Header.Add(fasthttp.HeaderContentSecurityPolicy, fmt.Sprintf(tmplCSPSwaggerNonce, nonce, nonce))
+		}
+
+		switch ext {
+		case extHTML:
+			ctx.SetContentTypeTextHTML()
+		case extYML:
+			ctx.SetContentTypeApplicationYAML()
+		default:
+			ctx.SetContentTypeTextPlain()
+		}
+
+		var err error
+
+		if err = t.Execute(ctx.Response.BodyWriter(), opts.OpenAPIData(ctx.BasePath(), ctx.RootURLSlash().String(), nonce)); err != nil {
+			ctx.RequestCtx.Error("an error occurred", 503)
+			ctx.Logger.WithError(err).Errorf("Error occcurred rendering template")
+
+			return
+		}
+	}
+}
+
+// ETagRootURL dynamically matches the If-None-Match header and adds the ETag header.
+func ETagRootURL(next middlewares.RequestHandler) middlewares.RequestHandler {
+	etags := map[string][]byte{}
+
+	h := sha1.New() //nolint:gosec // Usage is for collision avoidance not security.
+	mu := &sync.Mutex{}
+
+	return func(ctx *middlewares.AutheliaCtx) {
+		k := ctx.RootURLSlash().String()
+
+		mu.Lock()
+
+		etag, ok := etags[k]
+
+		mu.Unlock()
+
+		if ok && bytes.Equal(etag, ctx.Request.Header.PeekBytes(headerIfNoneMatch)) {
+			ctx.Response.Header.SetBytesKV(headerETag, etag)
+			ctx.Response.Header.SetBytesKV(headerCacheControl, headerValueCacheControlETaggedAssets)
+
+			ctx.SetStatusCode(fasthttp.StatusNotModified)
+
+			return
+		}
+
+		next(ctx)
+
+		mu.Lock()
+
+		h.Write(ctx.Response.Body())
+		sum := h.Sum(nil)
+		h.Reset()
+
+		etagNew := make([]byte, hex.EncodedLen(len(sum)))
+
+		hex.Encode(etagNew, sum)
+
+		if !ok || !bytes.Equal(etag, etagNew) {
+			etags[k] = etagNew
+		}
+
+		mu.Unlock()
+
+		ctx.Response.Header.SetBytesKV(headerETag, etagNew)
+		ctx.Response.Header.SetBytesKV(headerCacheControl, headerValueCacheControlETaggedAssets)
+	}
+}
+
 func writeHealthCheckEnv(disabled bool, scheme, host, path string, port int) (err error) {
 	if disabled {
 		return nil
@@ -120,11 +189,17 @@ func writeHealthCheckEnv(disabled bool, scheme, host, path string, port int) (er
 func NewTemplatedFileOptions(config *schema.Configuration) (opts *TemplatedFileOptions) {
 	opts = &TemplatedFileOptions{
 		AssetPath:              config.Server.AssetPath,
-		DuoSelfEnrollment:      f,
+		DuoSelfEnrollment:      strFalse,
 		RememberMe:             strconv.FormatBool(config.Session.RememberMeDuration != schema.RememberMeDisabled),
 		ResetPassword:          strconv.FormatBool(!config.AuthenticationBackend.PasswordReset.Disable),
 		ResetPasswordCustomURL: config.AuthenticationBackend.PasswordReset.CustomURL.String(),
 		Theme:                  config.Theme,
+
+		EndpointsPasswordReset: !(config.AuthenticationBackend.PasswordReset.Disable || config.AuthenticationBackend.PasswordReset.CustomURL.String() != ""),
+		EndpointsWebauthn:      !config.Webauthn.Disable,
+		EndpointsTOTP:          !config.TOTP.Disable,
+		EndpointsDuo:           !config.DuoAPI.Disable,
+		EndpointsOpenIDConnect: !(config.IdentityProviders.OIDC == nil),
 	}
 
 	if !config.DuoAPI.Disable {
@@ -143,6 +218,12 @@ type TemplatedFileOptions struct {
 	ResetPasswordCustomURL string
 	Session                string
 	Theme                  string
+
+	EndpointsPasswordReset bool
+	EndpointsWebauthn      bool
+	EndpointsTOTP          bool
+	EndpointsDuo           bool
+	EndpointsOpenIDConnect bool
 }
 
 // CommonData returns a TemplatedFileCommonData with the dynamic options.
@@ -161,6 +242,22 @@ func (options *TemplatedFileOptions) CommonData(base, baseURL, nonce, logoOverri
 	}
 }
 
+// OpenAPIData returns a TemplatedFileOpenAPIData with the dynamic options.
+func (options *TemplatedFileOptions) OpenAPIData(base, baseURL, nonce string) TemplatedFileOpenAPIData {
+	return TemplatedFileOpenAPIData{
+		Base:     base,
+		BaseURL:  baseURL,
+		CSPNonce: nonce,
+
+		Session:       options.Session,
+		PasswordReset: options.EndpointsPasswordReset,
+		Webauthn:      options.EndpointsWebauthn,
+		TOTP:          options.EndpointsTOTP,
+		Duo:           options.EndpointsDuo,
+		OpenIDConnect: options.EndpointsOpenIDConnect,
+	}
+}
+
 // TemplatedFileCommonData is a struct which is used for many templated files.
 type TemplatedFileCommonData struct {
 	Base                   string
@@ -174,3 +271,16 @@ type TemplatedFileCommonData struct {
 	Session                string
 	Theme                  string
 }
+
+// TemplatedFileOpenAPIData is a struct which is used for the OpenAPI spec file.
+type TemplatedFileOpenAPIData struct {
+	Base          string
+	BaseURL       string
+	CSPNonce      string
+	Session       string
+	PasswordReset bool
+	Webauthn      bool
+	TOTP          bool
+	Duo           bool
+	OpenIDConnect bool
+}
diff --git a/internal/suites/scenario_custom_headers_test.go b/internal/suites/scenario_custom_headers_test.go
index e03c903ec..5a0115122 100644
--- a/internal/suites/scenario_custom_headers_test.go
+++ b/internal/suites/scenario_custom_headers_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	mapset "github.com/deckarep/golang-set"
+	mapset "github.com/deckarep/golang-set/v2"
 	"github.com/stretchr/testify/suite"
 )
 
@@ -89,7 +89,7 @@ func (s *CustomHeadersScenario) TestShouldForwardCustomHeaderForAuthenticatedUse
 		s.collectScreenshot(ctx.Err(), s.Page)
 	}()
 
-	expectedGroups := mapset.NewSetWith("dev", "admins")
+	expectedGroups := mapset.NewSet("dev", "admins")
 
 	targetURL := fmt.Sprintf("%s/headers", PublicBaseURL)
 	s.doLoginOneFactor(s.T(), s.Context(ctx), "john", "password", false, targetURL)
@@ -109,7 +109,7 @@ func (s *CustomHeadersScenario) TestShouldForwardCustomHeaderForAuthenticatedUse
 	}
 
 	groups := strings.Split(payload.Headers.ForwardedGroups, ",")
-	actualGroups := mapset.NewSet()
+	actualGroups := mapset.NewSet[string]()
 
 	for _, group := range groups {
 		actualGroups.Add(group)
diff --git a/internal/suites/suite_cli_test.go b/internal/suites/suite_cli_test.go
index e68099aec..957609804 100644
--- a/internal/suites/suite_cli_test.go
+++ b/internal/suites/suite_cli_test.go
@@ -792,7 +792,7 @@ func (s *CLISuite) TestStorage00ShouldShowCorrectPreInitInformation() {
 
 	output, err = s.Exec("authelia-backend", []string{"authelia", s.testArg, s.coverageArg, "storage", "encryption", "check", "--config=/config/configuration.storage.yml"})
 	s.Assert().EqualError(err, "exit status 1")
-	s.Assert().Contains(output, "Error: command requires the use of a up to date schema version: storage schema outdated: version 0 is outdated please migrate to version 7 in order to use this command or use an older binary\n")
+	s.Assert().Regexp(regexp.MustCompile(`^Error: command requires the use of a up to date schema version: storage schema outdated: version 0 is outdated please migrate to version \d+ in order to use this command or use an older binary\n`), output)
 
 	output, err = s.Exec("authelia-backend", []string{"authelia", s.testArg, s.coverageArg, "storage", "migrate", "down", "--target=0", "--destroy-data", "--config=/config/configuration.storage.yml"})
 	s.Assert().EqualError(err, "exit status 1")
@@ -1131,7 +1131,14 @@ func (s *CLISuite) TestStorage05ShouldChangeEncryptionKey() {
 	output, err = s.Exec("authelia-backend", []string{"authelia", s.testArg, s.coverageArg, "storage", "encryption", "check", "--verbose", "--config=/config/configuration.storage.yml"})
 	s.Assert().NoError(err)
 
-	s.Assert().Contains(output, "Storage Encryption Key Validation: FAILURE\n\n\tCause: the configured encryption key does not appear to be valid for this database which may occur if the encryption key was changed in the configuration without using the cli to change it in the database.\n\nTables:\n\n\tTable (oauth2_access_token_session): N/A\n\t\tInvalid Rows: 0\n\t\tTotal Rows: 0\n\n\tTable (oauth2_authorization_code_session): N/A\n\t\tInvalid Rows: 0\n\t\tTotal Rows: 0\n\n\tTable (oauth2_openid_connect_session): N/A\n\t\tInvalid Rows: 0\n\t\tTotal Rows: 0\n\n\tTable (oauth2_pkce_request_session): N/A\n\t\tInvalid Rows: 0\n\t\tTotal Rows: 0\n\n\tTable (oauth2_refresh_token_session): N/A\n\t\tInvalid Rows: 0\n\t\tTotal Rows: 0\n\n\tTable (totp_configurations): FAILURE\n\t\tInvalid Rows: 4\n\t\tTotal Rows: 4\n\n\tTable (webauthn_devices): N/A\n\t\tInvalid Rows: 0\n\t\tTotal Rows: 0\n")
+	s.Assert().Contains(output, "Storage Encryption Key Validation: FAILURE\n\n\tCause: the configured encryption key does not appear to be valid for this database which may occur if the encryption key was changed in the configuration without using the cli to change it in the database.\n\nTables:\n\n")
+	s.Assert().Contains(output, "\n\n\tTable (oauth2_access_token_session): N/A\n\t\tInvalid Rows: 0\n\t\tTotal Rows: 0\n")
+	s.Assert().Contains(output, "\n\n\tTable (oauth2_authorization_code_session): N/A\n\t\tInvalid Rows: 0\n\t\tTotal Rows: 0\n")
+	s.Assert().Contains(output, "\n\n\tTable (oauth2_openid_connect_session): N/A\n\t\tInvalid Rows: 0\n\t\tTotal Rows: 0\n")
+	s.Assert().Contains(output, "\n\n\tTable (oauth2_pkce_request_session): N/A\n\t\tInvalid Rows: 0\n\t\tTotal Rows: 0\n")
+	s.Assert().Contains(output, "\n\n\tTable (oauth2_refresh_token_session): N/A\n\t\tInvalid Rows: 0\n\t\tTotal Rows: 0\n")
+	s.Assert().Contains(output, "\n\n\tTable (totp_configurations): FAILURE\n\t\tInvalid Rows: 4\n\t\tTotal Rows: 4\n")
+	s.Assert().Contains(output, "\n\n\tTable (webauthn_devices): N/A\n\t\tInvalid Rows: 0\n\t\tTotal Rows: 0\n")
 
 	output, err = s.Exec("authelia-backend", []string{"authelia", s.testArg, s.coverageArg, "storage", "encryption", "check", "--encryption-key=apple-apple-apple-apple", "--config=/config/configuration.storage.yml"})
 	s.Assert().NoError(err)
@@ -1141,7 +1148,14 @@ func (s *CLISuite) TestStorage05ShouldChangeEncryptionKey() {
 	output, err = s.Exec("authelia-backend", []string{"authelia", s.testArg, s.coverageArg, "storage", "encryption", "check", "--verbose", "--encryption-key=apple-apple-apple-apple", "--config=/config/configuration.storage.yml"})
 	s.Assert().NoError(err)
 
-	s.Assert().Contains(output, "Storage Encryption Key Validation: SUCCESS\n\nTables:\n\n\tTable (oauth2_access_token_session): N/A\n\t\tInvalid Rows: 0\n\t\tTotal Rows: 0\n\n\tTable (oauth2_authorization_code_session): N/A\n\t\tInvalid Rows: 0\n\t\tTotal Rows: 0\n\n\tTable (oauth2_openid_connect_session): N/A\n\t\tInvalid Rows: 0\n\t\tTotal Rows: 0\n\n\tTable (oauth2_pkce_request_session): N/A\n\t\tInvalid Rows: 0\n\t\tTotal Rows: 0\n\n\tTable (oauth2_refresh_token_session): N/A\n\t\tInvalid Rows: 0\n\t\tTotal Rows: 0\n\n\tTable (totp_configurations): SUCCESS\n\t\tInvalid Rows: 0\n\t\tTotal Rows: 4\n\n\tTable (webauthn_devices): N/A\n\t\tInvalid Rows: 0\n\t\tTotal Rows: 0\n")
+	s.Assert().Contains(output, "Storage Encryption Key Validation: SUCCESS\n\nTables:\n\n")
+	s.Assert().Contains(output, "\n\n\tTable (oauth2_access_token_session): N/A\n\t\tInvalid Rows: 0\n\t\tTotal Rows: 0\n")
+	s.Assert().Contains(output, "\n\n\tTable (oauth2_authorization_code_session): N/A\n\t\tInvalid Rows: 0\n\t\tTotal Rows: 0\n")
+	s.Assert().Contains(output, "\n\n\tTable (oauth2_openid_connect_session): N/A\n\t\tInvalid Rows: 0\n\t\tTotal Rows: 0\n")
+	s.Assert().Contains(output, "\n\n\tTable (oauth2_pkce_request_session): N/A\n\t\tInvalid Rows: 0\n\t\tTotal Rows: 0\n")
+	s.Assert().Contains(output, "\n\n\tTable (oauth2_refresh_token_session): N/A\n\t\tInvalid Rows: 0\n\t\tTotal Rows: 0\n")
+	s.Assert().Contains(output, "\n\n\tTable (totp_configurations): SUCCESS\n\t\tInvalid Rows: 0\n\t\tTotal Rows: 4\n")
+	s.Assert().Contains(output, "\n\n\tTable (webauthn_devices): N/A\n\t\tInvalid Rows: 0\n\t\tTotal Rows: 0\n")
 
 	output, err = s.Exec("authelia-backend", []string{"authelia", s.testArg, s.coverageArg, "storage", "encryption", "change-key", "--encryption-key=apple-apple-apple-apple", "--config=/config/configuration.storage.yml"})
 	s.Assert().EqualError(err, "exit status 1")
diff --git a/internal/templates/const.go b/internal/templates/const.go
index bf7bffa71..755807c44 100644
--- a/internal/templates/const.go
+++ b/internal/templates/const.go
@@ -8,7 +8,6 @@ const (
 // Template File Names.
 const (
 	TemplateNameEmailIdentityVerification = "IdentityVerification"
-	TemplateNameEmailPasswordReset        = "PasswordReset"
 	TemplateNameEmailEvent                = "Event"
 )
 
diff --git a/internal/templates/funcs.go b/internal/templates/funcs.go
index dc4547d03..7d173f636 100644
--- a/internal/templates/funcs.go
+++ b/internal/templates/funcs.go
@@ -10,6 +10,8 @@ import (
 	"fmt"
 	"hash"
 	"os"
+	"path"
+	"path/filepath"
 	"reflect"
 	"sort"
 	"strconv"
@@ -49,6 +51,28 @@ func FuncMap() map[string]any {
 		"b64dec":     FuncB64Dec,
 		"b32enc":     FuncB32Enc,
 		"b32dec":     FuncB32Dec,
+		"list":       FuncList,
+		"dict":       FuncDict,
+		"get":        FuncGet,
+		"set":        FuncSet,
+		"isAbs":      path.IsAbs,
+		"base":       path.Base,
+		"dir":        path.Dir,
+		"ext":        path.Ext,
+		"clean":      path.Clean,
+		"osBase":     filepath.Base,
+		"osClean":    filepath.Clean,
+		"osDir":      filepath.Dir,
+		"osExt":      filepath.Ext,
+		"osIsAbs":    filepath.IsAbs,
+		"deepEqual":  reflect.DeepEqual,
+		"typeOf":     FuncTypeOf,
+		"typeIs":     FuncTypeIs,
+		"typeIsLike": FuncTypeIsLike,
+		"kindOf":     FuncKindOf,
+		"kindIs":     FuncKindIs,
+		"default":    FuncDefault,
+		"empty":      FuncEmpty,
 	}
 }
 
@@ -202,58 +226,6 @@ func FuncStringQuote(in ...any) string {
 	return strings.Join(out, " ")
 }
 
-func strval(v interface{}) string {
-	switch v := v.(type) {
-	case string:
-		return v
-	case []byte:
-		return string(v)
-	case fmt.Stringer:
-		return v.String()
-	default:
-		return fmt.Sprintf("%v", v)
-	}
-}
-
-func strslice(v any) []string {
-	switch v := v.(type) {
-	case []string:
-		return v
-	case []interface{}:
-		b := make([]string, 0, len(v))
-
-		for _, s := range v {
-			if s != nil {
-				b = append(b, strval(s))
-			}
-		}
-
-		return b
-	default:
-		val := reflect.ValueOf(v)
-		switch val.Kind() {
-		case reflect.Array, reflect.Slice:
-			l := val.Len()
-			b := make([]string, 0, l)
-
-			for i := 0; i < l; i++ {
-				value := val.Index(i).Interface()
-				if value != nil {
-					b = append(b, strval(value))
-				}
-			}
-
-			return b
-		default:
-			if v == nil {
-				return []string{}
-			}
-
-			return []string{strval(v)}
-		}
-	}
-}
-
 // FuncIterate is a template function which takes a single uint returning a slice of units from 0 up to that number.
 func FuncIterate(count *uint) (out []uint) {
 	var i uint
@@ -308,3 +280,107 @@ func FuncStringJoinX(elems []string, sep string, n int, p string) string {
 
 	return buf.String()
 }
+
+// FuncTypeIs is a helper function that provides similar functionality to the helm typeIs func.
+func FuncTypeIs(is string, v any) bool {
+	return is == FuncTypeOf(v)
+}
+
+// FuncTypeIsLike is a helper function that provides similar functionality to the helm typeIsLike func.
+func FuncTypeIsLike(is string, v any) bool {
+	t := FuncTypeOf(v)
+
+	return is == t || "*"+is == t
+}
+
+// FuncTypeOf is a helper function that provides similar functionality to the helm typeOf func.
+func FuncTypeOf(v any) string {
+	return reflect.ValueOf(v).Type().String()
+}
+
+// FuncKindIs is a helper function that provides similar functionality to the helm kindIs func.
+func FuncKindIs(is string, v any) bool {
+	return is == FuncKindOf(v)
+}
+
+// FuncKindOf is a helper function that provides similar functionality to the helm kindOf func.
+func FuncKindOf(v any) string {
+	return reflect.ValueOf(v).Kind().String()
+}
+
+// FuncList is a helper function that provides similar functionality to the helm list func.
+func FuncList(items ...any) []any {
+	return items
+}
+
+// FuncDict is a helper function that provides similar functionality to the helm dict func.
+func FuncDict(pairs ...any) map[string]any {
+	m := map[string]any{}
+	p := len(pairs)
+
+	for i := 0; i < p; i += 2 {
+		key := strval(pairs[i])
+
+		if i+1 >= p {
+			m[key] = ""
+
+			continue
+		}
+
+		m[key] = pairs[i+1]
+	}
+
+	return m
+}
+
+// FuncGet is a helper function that provides similar functionality to the helm get func.
+func FuncGet(m map[string]any, key string) any {
+	if val, ok := m[key]; ok {
+		return val
+	}
+
+	return ""
+}
+
+// FuncSet is a helper function that provides similar functionality to the helm set func.
+func FuncSet(m map[string]any, key string, value any) map[string]any {
+	m[key] = value
+
+	return m
+}
+
+// FuncDefault is a helper function that provides similar functionality to the helm default func.
+func FuncDefault(d any, vals ...any) any {
+	if FuncEmpty(vals) || FuncEmpty(vals[0]) {
+		return d
+	}
+
+	return vals[0]
+}
+
+// FuncEmpty is a helper function that provides similar functionality to the helm empty func.
+func FuncEmpty(v any) bool {
+	rv := reflect.ValueOf(v)
+	if !rv.IsValid() {
+		return true
+	}
+
+	switch rv.Kind() {
+	default:
+		return rv.IsNil()
+	case reflect.Array, reflect.Slice, reflect.Map, reflect.String:
+		return rv.Len() == 0
+	case reflect.Bool:
+		return !rv.Bool()
+	case reflect.Complex64, reflect.Complex128:
+		return rv.Complex() == 0
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		return rv.Int() == 0
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
+		return rv.Uint() == 0
+	case reflect.Float32, reflect.Float64:
+		return rv.Float() == 0
+	case reflect.Struct:
+		return false
+	}
+}
diff --git a/internal/templates/funcs_test.go b/internal/templates/funcs_test.go
index d6907ace8..a3eb5b23f 100644
--- a/internal/templates/funcs_test.go
+++ b/internal/templates/funcs_test.go
@@ -357,6 +357,7 @@ func TestFuncSortAlpha(t *testing.T) {
 	}{
 		{"ShouldSortStrings", []string{"a", "c", "b"}, []string{"a", "b", "c"}},
 		{"ShouldSortIntegers", []int{2, 3, 1}, []string{"1", "2", "3"}},
+		{"ShouldSortSingleValue", 1, []string{"1"}},
 	}
 
 	for _, tc := range testCases {
@@ -469,3 +470,171 @@ func TestFuncStringSQuote(t *testing.T) {
 		})
 	}
 }
+
+func TestFuncTypeOf(t *testing.T) {
+	astring := "typeOfExample"
+	anint := 5
+	astringslice := []string{astring}
+	anintslice := []int{anint}
+
+	testCases := []struct {
+		name         string
+		have         any
+		expected     string
+		expectedKind string
+	}{
+		{"String", astring, "string", "string"},
+		{"StringPtr", &astring, "*string", "ptr"},
+		{"StringSlice", astringslice, "[]string", "slice"},
+		{"StringSlicePtr", &astringslice, "*[]string", "ptr"},
+		{"Integer", anint, "int", "int"},
+		{"IntegerPtr", &anint, "*int", "ptr"},
+		{"IntegerSlice", anintslice, "[]int", "slice"},
+		{"IntegerSlicePtr", &anintslice, "*[]int", "ptr"},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			assert.Equal(t, tc.expected, FuncTypeOf(tc.have))
+			assert.Equal(t, tc.expectedKind, FuncKindOf(tc.have))
+		})
+	}
+}
+
+func TestFuncTypeIs(t *testing.T) {
+	astring := "typeIsExample"
+	anint := 10
+	astringslice := []string{astring}
+	anintslice := []int{anint}
+
+	testCases := []struct {
+		name         string
+		is           string
+		have         any
+		expected     bool
+		expectedLike bool
+		expectedKind bool
+	}{
+		{"ShouldMatchStringAsString", "string", astring, true, true, true},
+		{"ShouldMatchStringPtrAsString", "string", &astring, false, true, false},
+		{"ShouldNotMatchStringAsInt", "int", astring, false, false, false},
+		{"ShouldNotMatchStringSliceAsStringSlice", "[]string", astringslice, true, true, false},
+		{"ShouldNotMatchStringSlicePtrAsStringSlice", "[]string", &astringslice, false, true, false},
+		{"ShouldNotMatchStringSlicePtrAsStringSlicePtr", "*[]string", &astringslice, true, true, false},
+		{"ShouldNotMatchStringSliceAsString", "string", astringslice, false, false, false},
+		{"ShouldMatchIntAsInt", "int", anint, true, true, true},
+		{"ShouldMatchIntPtrAsInt", "int", &anint, false, true, false},
+		{"ShouldNotMatchIntAsString", "string", anint, false, false, false},
+		{"ShouldMatchIntegerSliceAsIntSlice", "[]int", anintslice, true, true, false},
+		{"ShouldMatchIntegerSlicePtrAsIntSlice", "[]int", &anintslice, false, true, false},
+		{"ShouldMatchIntegerSlicePtrAsIntSlicePtr", "*[]int", &anintslice, true, true, false},
+		{"ShouldNotMatchIntegerSliceAsInt", "int", anintslice, false, false, false},
+		{"ShouldMatchKindSlice", "slice", anintslice, false, false, true},
+		{"ShouldMatchKindPtr", "ptr", &anintslice, false, false, true},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			assert.Equal(t, tc.expected, FuncTypeIs(tc.is, tc.have))
+			assert.Equal(t, tc.expectedLike, FuncTypeIsLike(tc.is, tc.have))
+			assert.Equal(t, tc.expectedKind, FuncKindIs(tc.is, tc.have))
+		})
+	}
+}
+
+func TestFuncList(t *testing.T) {
+	assert.Equal(t, []any{"a", "b", "c"}, FuncList("a", "b", "c"))
+	assert.Equal(t, []any{1, 2, 3}, FuncList(1, 2, 3))
+}
+
+func TestFuncDict(t *testing.T) {
+	assert.Equal(t, map[string]any{"a": 1}, FuncDict("a", 1))
+	assert.Equal(t, map[string]any{"a": 1, "b": ""}, FuncDict("a", 1, "b"))
+	assert.Equal(t, map[string]any{"1": 1, "b": 2}, FuncDict(1, 1, "b", 2))
+	assert.Equal(t, map[string]any{"true": 1, "b": 2}, FuncDict(true, 1, "b", 2))
+	assert.Equal(t, map[string]any{"a": 2, "b": 3}, FuncDict("a", 1, "a", 2, "b", 3))
+}
+
+func TestFuncGet(t *testing.T) {
+	assert.Equal(t, 123, FuncGet(map[string]any{"abc": 123}, "abc"))
+	assert.Equal(t, "", FuncGet(map[string]any{"abc": 123}, "123"))
+}
+
+func TestFuncSet(t *testing.T) {
+	assert.Equal(t, map[string]any{"abc": 123, "123": true}, FuncSet(map[string]any{"abc": 123}, "123", true))
+	assert.Equal(t, map[string]any{"abc": true}, FuncSet(map[string]any{"abc": 123}, "abc", true))
+}
+
+func TestFuncDefault(t *testing.T) {
+	testCases := []struct {
+		name     string
+		value    []any
+		have     any
+		expected any
+	}{
+		{"ShouldDefaultEmptyString", []any{""}, "default", "default"},
+		{"ShouldNotDefaultString", []any{"not default"}, "default", "not default"},
+		{"ShouldDefaultEmptyInteger", []any{0}, 1, 1},
+		{"ShouldNotDefaultInteger", []any{20}, 1, 20},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			assert.Equal(t, tc.expected, FuncDefault(tc.have, tc.value...))
+		})
+	}
+}
+
+func TestFuncEmpty(t *testing.T) {
+	var nilv *string
+
+	testCases := []struct {
+		name     string
+		value    any
+		expected bool
+	}{
+		{"ShouldBeEmptyNil", nilv, true},
+		{"ShouldBeEmptyNilNil", nil, true},
+		{"ShouldBeEmptyString", "", true},
+		{"ShouldNotBeEmptyString", "abc", false},
+		{"ShouldBeEmptyArray", []string{}, true},
+		{"ShouldNotBeEmptyArray", []string{"abc"}, false},
+		{"ShouldBeEmptyInteger", 0, true},
+		{"ShouldNotBeEmptyInteger", 1, false},
+		{"ShouldBeEmptyInteger8", int8(0), true},
+		{"ShouldNotBeEmptyInteger8", int8(1), false},
+		{"ShouldBeEmptyInteger16", int16(0), true},
+		{"ShouldNotBeEmptyInteger16", int16(1), false},
+		{"ShouldBeEmptyInteger32", int32(0), true},
+		{"ShouldNotBeEmptyInteger32", int32(1), false},
+		{"ShouldBeEmptyInteger64", int64(0), true},
+		{"ShouldNotBeEmptyInteger64", int64(1), false},
+		{"ShouldBeEmptyUnsignedInteger", uint(0), true},
+		{"ShouldNotBeEmptyUnsignedInteger", uint(1), false},
+		{"ShouldBeEmptyUnsignedInteger8", uint8(0), true},
+		{"ShouldNotBeEmptyUnsignedInteger8", uint8(1), false},
+		{"ShouldBeEmptyUnsignedInteger16", uint16(0), true},
+		{"ShouldNotBeEmptyUnsignedInteger16", uint16(1), false},
+		{"ShouldBeEmptyUnsignedInteger32", uint32(0), true},
+		{"ShouldNotBeEmptyUnsignedInteger32", uint32(1), false},
+		{"ShouldBeEmptyUnsignedInteger64", uint64(0), true},
+		{"ShouldNotBeEmptyUnsignedInteger64", uint64(1), false},
+		{"ShouldBeEmptyComplex64", complex64(complex(0, 0)), true},
+		{"ShouldNotBeEmptyComplex64", complex64(complex(100000, 7.5)), false},
+		{"ShouldBeEmptyComplex128", complex128(complex(0, 0)), true},
+		{"ShouldNotBeEmptyComplex128", complex128(complex(100000, 7.5)), false},
+		{"ShouldBeEmptyFloat32", float32(0), true},
+		{"ShouldNotBeEmptyFloat32", float32(1), false},
+		{"ShouldBeEmptyFloat64", float64(0), true},
+		{"ShouldNotBeEmptyFloat64", float64(1), false},
+		{"ShouldBeEmptyBoolean", false, true},
+		{"ShouldNotBeEmptyBoolean", true, false},
+		{"ShouldNotBeEmptyStruct", struct{}{}, false},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			assert.Equal(t, tc.expected, FuncEmpty(tc.value))
+		})
+	}
+}
diff --git a/internal/templates/provider.go b/internal/templates/provider.go
index 3c122aea2..08ce6701c 100644
--- a/internal/templates/provider.go
+++ b/internal/templates/provider.go
@@ -1,7 +1,9 @@
 package templates
 
 import (
+	"embed"
 	"fmt"
+	"text/template"
 )
 
 // New creates a new templates' provider.
@@ -23,6 +25,64 @@ type Provider struct {
 	templates Templates
 }
 
+// LoadTemplatedAssets takes an embed.FS and loads each templated asset document into a Template.
+func (p *Provider) LoadTemplatedAssets(fs embed.FS) (err error) {
+	var (
+		data []byte
+	)
+
+	if data, err = fs.ReadFile("public_html/index.html"); err != nil {
+		return err
+	}
+
+	if p.templates.asset.index, err = template.
+		New("assets/public_html/index.html").
+		Funcs(FuncMap()).
+		Parse(string(data)); err != nil {
+		return err
+	}
+
+	if data, err = fs.ReadFile("public_html/api/index.html"); err != nil {
+		return err
+	}
+
+	if p.templates.asset.api.index, err = template.
+		New("assets/public_html/api/index.html").
+		Funcs(FuncMap()).
+		Parse(string(data)); err != nil {
+		return err
+	}
+
+	if data, err = fs.ReadFile("public_html/api/openapi.yml"); err != nil {
+		return err
+	}
+
+	if p.templates.asset.api.spec, err = template.
+		New("api/public_html/openapi.yaml").
+		Funcs(FuncMap()).
+		Parse(string(data)); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// GetAssetIndexTemplate returns a Template used to generate the React index document.
+func (p *Provider) GetAssetIndexTemplate() (t Template) {
+	return p.templates.asset.index
+}
+
+// GetAssetOpenAPIIndexTemplate returns a Template used to generate the OpenAPI index document.
+func (p *Provider) GetAssetOpenAPIIndexTemplate() (t Template) {
+	return p.templates.asset.api.index
+}
+
+// GetAssetOpenAPISpecTemplate returns a Template used to generate the OpenAPI specification document.
+func (p *Provider) GetAssetOpenAPISpecTemplate() (t Template) {
+	return p.templates.asset.api.spec
+}
+
+// GetEventEmailTemplate returns an EmailTemplate used for generic event notifications.
 func (p *Provider) GetEventEmailTemplate() (t *EmailTemplate) {
 	return p.templates.notification.event
 }
diff --git a/internal/templates/types.go b/internal/templates/types.go
index 9dd01de5c..51c5b254c 100644
--- a/internal/templates/types.go
+++ b/internal/templates/types.go
@@ -9,6 +9,17 @@ import (
 // Templates is the struct which holds all the *template.Template values.
 type Templates struct {
 	notification NotificationTemplates
+	asset        AssetTemplates
+}
+
+type AssetTemplates struct {
+	index *tt.Template
+	api   APIAssetTemplates
+}
+
+type APIAssetTemplates struct {
+	index *tt.Template
+	spec  *tt.Template
 }
 
 // NotificationTemplates are the templates for the notification system.
diff --git a/internal/templates/util.go b/internal/templates/util.go
index 4b91f9979..f584c291e 100644
--- a/internal/templates/util.go
+++ b/internal/templates/util.go
@@ -6,6 +6,7 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"reflect"
 	"strings"
 	tt "text/template"
 )
@@ -39,24 +40,17 @@ func isSecretEnvKey(key string) (isSecretEnvKey bool) {
 	return false
 }
 
-func templateExists(path string) (exists bool) {
+func fileExists(path string) (exists bool) {
 	info, err := os.Stat(path)
-	if err != nil {
-		return false
-	}
 
-	if info.IsDir() {
-		return false
-	}
-
-	return true
+	return err == nil && !info.IsDir()
 }
 
 func readTemplate(name, ext, category, overridePath string) (tPath string, embed bool, data []byte, err error) {
 	if overridePath != "" {
 		tPath = filepath.Join(overridePath, name+ext)
 
-		if templateExists(tPath) {
+		if fileExists(tPath) {
 			if data, err = os.ReadFile(tPath); err != nil {
 				return tPath, false, nil, fmt.Errorf("failed to read template override at path '%s': %w", tPath, err)
 			}
@@ -125,3 +119,55 @@ func loadEmailTemplate(name, overridePath string) (t *EmailTemplate, err error)
 
 	return t, nil
 }
+
+func strval(v any) string {
+	switch v := v.(type) {
+	case string:
+		return v
+	case []byte:
+		return string(v)
+	case fmt.Stringer:
+		return v.String()
+	default:
+		return fmt.Sprintf("%v", v)
+	}
+}
+
+func strslice(v any) []string {
+	switch v := v.(type) {
+	case []string:
+		return v
+	case []any:
+		b := make([]string, 0, len(v))
+
+		for _, s := range v {
+			if s != nil {
+				b = append(b, strval(s))
+			}
+		}
+
+		return b
+	default:
+		val := reflect.ValueOf(v)
+		switch val.Kind() {
+		case reflect.Array, reflect.Slice:
+			l := val.Len()
+			b := make([]string, 0, l)
+
+			for i := 0; i < l; i++ {
+				value := val.Index(i).Interface()
+				if value != nil {
+					b = append(b, strval(value))
+				}
+			}
+
+			return b
+		default:
+			if v == nil {
+				return []string{}
+			}
+
+			return []string{strval(v)}
+		}
+	}
+}
diff --git a/internal/templates/util_test.go b/internal/templates/util_test.go
index 1260717fa..9397a91d8 100644
--- a/internal/templates/util_test.go
+++ b/internal/templates/util_test.go
@@ -1,9 +1,14 @@
 package templates
 
 import (
+	"io/fs"
+	"os"
+	"path/filepath"
 	"testing"
+	"text/template"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestIsSecretEnvKey(t *testing.T) {
@@ -28,3 +33,72 @@ func TestIsSecretEnvKey(t *testing.T) {
 		})
 	}
 }
+
+func TestParseTemplateDirectories(t *testing.T) {
+	testCases := []struct {
+		name, path string
+	}{
+		{"Templates", "./src"},
+		{"OpenAPI", "../../api"},
+		{"Generators", "../../cmd/authelia-gen/templates"},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			funcMap := FuncMap()
+
+			if tc.name == "Generators" {
+				funcMap["joinX"] = FuncStringJoinX
+			}
+
+			var (
+				data []byte
+			)
+
+			require.NoError(t, filepath.Walk(tc.path, func(path string, info fs.FileInfo, err error) error {
+				if info.IsDir() {
+					return nil
+				}
+
+				name := info.Name()
+
+				if tc.name == "Templates" {
+					name = filepath.Base(filepath.Dir(path)) + "/" + name
+				}
+
+				t.Run(name, func(t *testing.T) {
+					data, err = os.ReadFile(path)
+
+					require.NoError(t, err)
+
+					_, err = template.New(tc.name).Funcs(funcMap).Parse(string(data))
+
+					require.NoError(t, err)
+				})
+
+				return nil
+			}))
+		})
+	}
+}
+
+func TestParseMiscTemplates(t *testing.T) {
+	testCases := []struct {
+		name, path string
+	}{
+		{"ReactIndex", "../../web/index.html"},
+		{"ViteEnv", "../../web/.env.production"},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			data, err := os.ReadFile(tc.path)
+
+			require.NoError(t, err)
+
+			_, err = template.New(tc.name).Funcs(FuncMap()).Parse(string(data))
+
+			require.NoError(t, err)
+		})
+	}
+}
diff --git a/internal/utils/const.go b/internal/utils/const.go
index 2e65da318..cb02b5459 100644
--- a/internal/utils/const.go
+++ b/internal/utils/const.go
@@ -97,40 +97,6 @@ const (
 	timeUnixEpochAsMicrosoftNTEpoch uint64 = 116444736000000000
 )
 
-const (
-	// CharSetAlphabeticLower are literally just valid alphabetic lowercase printable ASCII chars.
-	CharSetAlphabeticLower = "abcdefghijklmnopqrstuvwxyz"
-
-	// CharSetAlphabeticUpper are literally just valid alphabetic uppercase printable ASCII chars.
-	CharSetAlphabeticUpper = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-
-	// CharSetAlphabetic are literally just valid alphabetic printable ASCII chars.
-	CharSetAlphabetic = CharSetAlphabeticLower + CharSetAlphabeticUpper
-
-	// CharSetNumeric are literally just valid numeric chars.
-	CharSetNumeric = "0123456789"
-
-	// CharSetNumericHex are literally just valid hexadecimal printable ASCII chars.
-	CharSetNumericHex = CharSetNumeric + "ABCDEF"
-
-	// CharSetSymbolic are literally just valid symbolic printable ASCII chars.
-	CharSetSymbolic = "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~"
-
-	// CharSetSymbolicRFC3986Unreserved are RFC3986 unreserved symbol characters.
-	// See https://www.rfc-editor.org/rfc/rfc3986#section-2.3.
-	CharSetSymbolicRFC3986Unreserved = "-._~"
-
-	// CharSetAlphaNumeric are literally just valid alphanumeric printable ASCII chars.
-	CharSetAlphaNumeric = CharSetAlphabetic + CharSetNumeric
-
-	// CharSetASCII are literally just valid printable ASCII chars.
-	CharSetASCII = CharSetAlphabetic + CharSetNumeric + CharSetSymbolic
-
-	// CharSetRFC3986Unreserved are RFC3986 unreserved characters.
-	// See https://www.rfc-editor.org/rfc/rfc3986#section-2.3.
-	CharSetRFC3986Unreserved = CharSetAlphabetic + CharSetNumeric + CharSetSymbolicRFC3986Unreserved
-)
-
 var htmlEscaper = strings.NewReplacer(
 	"&", "&amp;",
 	"<", "&lt;",
diff --git a/internal/utils/const_test.go b/internal/utils/const_test.go
index 879485536..fb6116a95 100644
--- a/internal/utils/const_test.go
+++ b/internal/utils/const_test.go
@@ -1,5 +1,11 @@
 package utils
 
+import (
+	"github.com/authelia/authelia/v4/internal/random"
+)
+
 const (
 	testStringInput = "abcdefghijkl"
 )
+
+var r = &random.Cryptographical{}
diff --git a/internal/utils/crypto.go b/internal/utils/crypto.go
index c8b7451db..6d74fc8ea 100644
--- a/internal/utils/crypto.go
+++ b/internal/utils/crypto.go
@@ -573,50 +573,3 @@ loop:
 
 	return extKeyUsage
 }
-
-// RandomString returns a random string with a given length with values from the provided characters. When crypto is set
-// to false we use math/rand and when it's set to true we use crypto/rand. The crypto option should always be set to true
-// excluding when the task is time sensitive and would not benefit from extra randomness.
-func RandomString(n int, characters string) (randomString string) {
-	return string(RandomBytes(n, characters))
-}
-
-// RandomBytes returns a random []byte with a given length with values from the provided characters. When crypto is set
-// to false we use math/rand and when it's set to true we use crypto/rand. The crypto option should always be set to true
-// excluding when the task is time sensitive and would not benefit from extra randomness.
-func RandomBytes(n int, characters string) (bytes []byte) {
-	bytes = make([]byte, n)
-
-	_, _ = rand.Read(bytes)
-
-	for i, b := range bytes {
-		bytes[i] = characters[b%byte(len(characters))]
-	}
-
-	return bytes
-}
-
-func RandomInt(n int) (int, error) {
-	if n <= 0 {
-		return 0, fmt.Errorf("n must be more than 0")
-	}
-
-	max := big.NewInt(int64(n))
-
-	if !max.IsUint64() {
-		return 0, fmt.Errorf("generated max is negative")
-	}
-
-	value, err := rand.Int(rand.Reader, max)
-	if err != nil {
-		return 0, err
-	}
-
-	output := int(value.Int64())
-
-	if output < 0 {
-		return 0, fmt.Errorf("generated number is too big for int")
-	}
-
-	return output, nil
-}
diff --git a/internal/utils/hashing_test.go b/internal/utils/hashing_test.go
index c6777189e..f814d1c9f 100644
--- a/internal/utils/hashing_test.go
+++ b/internal/utils/hashing_test.go
@@ -7,6 +7,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+
+	"github.com/authelia/authelia/v4/internal/random"
 )
 
 func TestShouldHashString(t *testing.T) {
@@ -22,7 +24,7 @@ func TestShouldHashString(t *testing.T) {
 	assert.Equal(t, "ae448ac86c4e8e4dec645729708ef41873ae79c6dff84eff73360989487f08e5", anotherSum)
 	assert.NotEqual(t, sum, anotherSum)
 
-	randomInput := RandomString(40, CharSetAlphaNumeric)
+	randomInput := r.StringCustom(40, random.CharSetAlphaNumeric)
 	randomSum := HashSHA256FromString(randomInput)
 
 	assert.NotEqual(t, randomSum, sum)
@@ -38,7 +40,7 @@ func TestShouldHashPath(t *testing.T) {
 	err = os.WriteFile(filepath.Join(dir, "anotherfile"), []byte("another\n"), 0600)
 	assert.NoError(t, err)
 
-	err = os.WriteFile(filepath.Join(dir, "randomfile"), []byte(RandomString(40, CharSetAlphaNumeric)+"\n"), 0600)
+	err = os.WriteFile(filepath.Join(dir, "randomfile"), []byte(r.StringCustom(40, random.CharSetAlphaNumeric)+"\n"), 0600)
 	assert.NoError(t, err)
 
 	sum, err := HashSHA256FromPath(filepath.Join(dir, "myfile"))
diff --git a/internal/utils/strings_test.go b/internal/utils/strings_test.go
index 49d3a3f69..fe7c6742e 100644
--- a/internal/utils/strings_test.go
+++ b/internal/utils/strings_test.go
@@ -53,13 +53,6 @@ func TestStringJoinDelimitedEscaped(t *testing.T) {
 	}
 }
 
-func TestShouldNotGenerateSameRandomString(t *testing.T) {
-	randomStringOne := RandomString(10, CharSetAlphaNumeric)
-	randomStringTwo := RandomString(10, CharSetAlphaNumeric)
-
-	assert.NotEqual(t, randomStringOne, randomStringTwo)
-}
-
 func TestShouldDetectAlphaNumericString(t *testing.T) {
 	assert.True(t, IsStringAlphaNumeric("abc"))
 	assert.True(t, IsStringAlphaNumeric("abc123"))
diff --git a/web/.env.production b/web/.env.production
index 2bdd24c5c..39ae4c29e 100644
--- a/web/.env.production
+++ b/web/.env.production
@@ -1,7 +1,7 @@
-VITE_LOGO_OVERRIDE={{.LogoOverride}}
-VITE_PUBLIC_URL={{.Base}}
-VITE_DUO_SELF_ENROLLMENT={{.DuoSelfEnrollment}}
-VITE_REMEMBER_ME={{.RememberMe}}
-VITE_RESET_PASSWORD={{.ResetPassword}}
-VITE_RESET_PASSWORD_CUSTOM_URL={{.ResetPasswordCustomURL}}
-VITE_THEME={{.Theme}}
+VITE_LOGO_OVERRIDE={{ .LogoOverride }}
+VITE_PUBLIC_URL={{ .Base }}
+VITE_DUO_SELF_ENROLLMENT={{ .DuoSelfEnrollment }}
+VITE_REMEMBER_ME={{ .RememberMe }}
+VITE_RESET_PASSWORD={{ .ResetPassword }}
+VITE_RESET_PASSWORD_CUSTOM_URL={{ .ResetPasswordCustomURL }}
+VITE_THEME={{ .Theme }}
diff --git a/web/index.html b/web/index.html
index 70970870c..fc961d145 100644
--- a/web/index.html
+++ b/web/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-  <base href="{{.BaseURL}}" />
-  <meta property="csp-nonce" content="{{.CSPNonce}}" />
+  <base href="{{ .BaseURL }}" />
+  <meta property="csp-nonce" content="{{ .CSPNonce }}" />
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="theme-color" content="#000000" />
diff --git a/web/package.json b/web/package.json
index a8a513759..17f6d1d55 100644
--- a/web/package.json
+++ b/web/package.json
@@ -26,16 +26,15 @@
     "@fortawesome/free-solid-svg-icons": "6.2.1",
     "@fortawesome/react-fontawesome": "0.2.0",
     "@mui/icons-material": "5.11.0",
-    "@mui/material": "5.11.2",
+    "@mui/material": "5.11.3",
     "@mui/styles": "5.11.2",
-    "axios": "1.2.1",
-    "broadcast-channel": "4.18.1",
+    "axios": "1.2.2",
+    "broadcast-channel": "4.20.1",
     "classnames": "2.3.2",
-    "i18next": "22.4.6",
+    "i18next": "22.4.8",
     "i18next-browser-languagedetector": "7.0.1",
     "i18next-http-backend": "2.1.1",
     "qrcode.react": "3.1.0",
-    "query-string": "7.1.3",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-i18next": "12.1.1",
@@ -143,24 +142,24 @@
     ]
   },
   "devDependencies": {
-    "@commitlint/cli": "17.3.0",
-    "@commitlint/config-conventional": "17.3.0",
+    "@commitlint/cli": "17.4.0",
+    "@commitlint/config-conventional": "17.4.0",
     "@limegrass/eslint-plugin-import-alias": "1.0.6",
     "@testing-library/jest-dom": "5.16.5",
     "@testing-library/react": "13.4.0",
-    "@types/jest": "29.2.4",
+    "@types/jest": "29.2.5",
     "@types/node": "18.11.18",
     "@types/qrcode.react": "1.0.2",
     "@types/react": "18.0.26",
     "@types/react-dom": "18.0.10",
     "@types/zxcvbn": "4.4.1",
-    "@typescript-eslint/eslint-plugin": "5.47.1",
-    "@typescript-eslint/parser": "5.47.1",
-    "@vitejs/plugin-react": "3.0.0",
-    "esbuild": "0.16.10",
+    "@typescript-eslint/eslint-plugin": "5.48.0",
+    "@typescript-eslint/parser": "5.48.0",
+    "@vitejs/plugin-react": "3.0.1",
+    "esbuild": "0.16.14",
     "esbuild-jest": "0.5.0",
-    "eslint": "8.30.0",
-    "eslint-config-prettier": "8.5.0",
+    "eslint": "8.31.0",
+    "eslint-config-prettier": "8.6.0",
     "eslint-config-react-app": "7.0.1",
     "eslint-formatter-rdjson": "1.0.5",
     "eslint-import-resolver-typescript": "3.5.2",
@@ -169,7 +168,7 @@
     "eslint-plugin-prettier": "4.2.1",
     "eslint-plugin-react": "7.31.11",
     "eslint-plugin-react-hooks": "4.6.0",
-    "husky": "8.0.2",
+    "husky": "8.0.3",
     "jest": "29.3.1",
     "jest-environment-jsdom": "29.3.1",
     "jest-transform-stub": "2.0.0",
@@ -177,7 +176,7 @@
     "prettier": "2.8.1",
     "react-test-renderer": "18.2.0",
     "typescript": "4.9.4",
-    "vite": "4.0.3",
+    "vite": "4.0.4",
     "vite-plugin-eslint": "1.8.1",
     "vite-plugin-istanbul": "3.0.4",
     "vite-plugin-svgr": "2.4.0",
diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml
index dca96524b..a85f71f23 100644
--- a/web/pnpm-lock.yaml
+++ b/web/pnpm-lock.yaml
@@ -1,8 +1,8 @@
 lockfileVersion: 5.4
 
 specifiers:
-  '@commitlint/cli': 17.3.0
-  '@commitlint/config-conventional': 17.3.0
+  '@commitlint/cli': 17.4.0
+  '@commitlint/config-conventional': 17.4.0
   '@emotion/cache': 11.10.5
   '@emotion/react': 11.10.5
   '@emotion/styled': 11.10.5
@@ -12,26 +12,26 @@ specifiers:
   '@fortawesome/react-fontawesome': 0.2.0
   '@limegrass/eslint-plugin-import-alias': 1.0.6
   '@mui/icons-material': 5.11.0
-  '@mui/material': 5.11.2
+  '@mui/material': 5.11.3
   '@mui/styles': 5.11.2
   '@testing-library/jest-dom': 5.16.5
   '@testing-library/react': 13.4.0
-  '@types/jest': 29.2.4
+  '@types/jest': 29.2.5
   '@types/node': 18.11.18
   '@types/qrcode.react': 1.0.2
   '@types/react': 18.0.26
   '@types/react-dom': 18.0.10
   '@types/zxcvbn': 4.4.1
-  '@typescript-eslint/eslint-plugin': 5.47.1
-  '@typescript-eslint/parser': 5.47.1
-  '@vitejs/plugin-react': 3.0.0
-  axios: 1.2.1
-  broadcast-channel: 4.18.1
+  '@typescript-eslint/eslint-plugin': 5.48.0
+  '@typescript-eslint/parser': 5.48.0
+  '@vitejs/plugin-react': 3.0.1
+  axios: 1.2.2
+  broadcast-channel: 4.20.1
   classnames: 2.3.2
-  esbuild: 0.16.10
+  esbuild: 0.16.14
   esbuild-jest: 0.5.0
-  eslint: 8.30.0
-  eslint-config-prettier: 8.5.0
+  eslint: 8.31.0
+  eslint-config-prettier: 8.6.0
   eslint-config-react-app: 7.0.1
   eslint-formatter-rdjson: 1.0.5
   eslint-import-resolver-typescript: 3.5.2
@@ -40,8 +40,8 @@ specifiers:
   eslint-plugin-prettier: 4.2.1
   eslint-plugin-react: 7.31.11
   eslint-plugin-react-hooks: 4.6.0
-  husky: 8.0.2
-  i18next: 22.4.6
+  husky: 8.0.3
+  i18next: 22.4.8
   i18next-browser-languagedetector: 7.0.1
   i18next-http-backend: 2.1.1
   jest: 29.3.1
@@ -50,7 +50,6 @@ specifiers:
   jest-watch-typeahead: 2.2.1
   prettier: 2.8.1
   qrcode.react: 3.1.0
-  query-string: 7.1.3
   react: 18.2.0
   react-dom: 18.2.0
   react-i18next: 12.1.1
@@ -59,7 +58,7 @@ specifiers:
   react-test-renderer: 18.2.0
   react18-input-otp: 1.1.2
   typescript: 4.9.4
-  vite: 4.0.3
+  vite: 4.0.4
   vite-plugin-eslint: 1.8.1
   vite-plugin-istanbul: 3.0.4
   vite-plugin-svgr: 2.4.0
@@ -74,53 +73,52 @@ dependencies:
   '@fortawesome/free-regular-svg-icons': 6.2.1
   '@fortawesome/free-solid-svg-icons': 6.2.1
   '@fortawesome/react-fontawesome': 0.2.0_z27bm67dtmuyyvss23ckjdrcuy
-  '@mui/icons-material': 5.11.0_iq6n432hogcf75rdfmlkzd4zne
-  '@mui/material': 5.11.2_lskpmcsdi7ipu6qpuapyu56ihm
+  '@mui/icons-material': 5.11.0_oiuuhmk4wjjpe4qb2sby7usney
+  '@mui/material': 5.11.3_lskpmcsdi7ipu6qpuapyu56ihm
   '@mui/styles': 5.11.2_kzbn2opkn2327fwg5yzwzya5o4
-  axios: 1.2.1
-  broadcast-channel: 4.18.1
+  axios: 1.2.2
+  broadcast-channel: 4.20.1
   classnames: 2.3.2
-  i18next: 22.4.6
+  i18next: 22.4.8
   i18next-browser-languagedetector: 7.0.1
   i18next-http-backend: 2.1.1
   qrcode.react: 3.1.0_react@18.2.0
-  query-string: 7.1.3
   react: 18.2.0
   react-dom: 18.2.0_react@18.2.0
-  react-i18next: 12.1.1_6vygckh2jgtx4nucc3no6lnm3y
+  react-i18next: 12.1.1_25zoxyjt3sfdpelgxivbzvmrha
   react-loading: 2.0.3_react@18.2.0
   react-router-dom: 6.6.1_biqbaboplfbrettd7655fr4n2y
   react18-input-otp: 1.1.2_biqbaboplfbrettd7655fr4n2y
   zxcvbn: 4.4.2
 
 devDependencies:
-  '@commitlint/cli': 17.3.0
-  '@commitlint/config-conventional': 17.3.0
-  '@limegrass/eslint-plugin-import-alias': 1.0.6_eslint@8.30.0
+  '@commitlint/cli': 17.4.0_@types+node@18.11.18
+  '@commitlint/config-conventional': 17.4.0
+  '@limegrass/eslint-plugin-import-alias': 1.0.6_eslint@8.31.0
   '@testing-library/jest-dom': 5.16.5
   '@testing-library/react': 13.4.0_biqbaboplfbrettd7655fr4n2y
-  '@types/jest': 29.2.4
+  '@types/jest': 29.2.5
   '@types/node': 18.11.18
   '@types/qrcode.react': 1.0.2
   '@types/react': 18.0.26
   '@types/react-dom': 18.0.10
   '@types/zxcvbn': 4.4.1
-  '@typescript-eslint/eslint-plugin': 5.47.1_txmweb6yn7coi7nfrp22gpyqmy
-  '@typescript-eslint/parser': 5.47.1_lzzuuodtsqwxnvqeq4g4likcqa
-  '@vitejs/plugin-react': 3.0.0_vite@4.0.3
-  esbuild: 0.16.10
-  esbuild-jest: 0.5.0_esbuild@0.16.10
-  eslint: 8.30.0
-  eslint-config-prettier: 8.5.0_eslint@8.30.0
-  eslint-config-react-app: 7.0.1_5dzg3kvqggpfcaryo776p5cisq
+  '@typescript-eslint/eslint-plugin': 5.48.0_k73wpmdolxikpyqun3p36akaaq
+  '@typescript-eslint/parser': 5.48.0_iukboom6ndih5an6iafl45j2fe
+  '@vitejs/plugin-react': 3.0.1_vite@4.0.4
+  esbuild: 0.16.14
+  esbuild-jest: 0.5.0_esbuild@0.16.14
+  eslint: 8.31.0
+  eslint-config-prettier: 8.6.0_eslint@8.31.0
+  eslint-config-react-app: 7.0.1_hcgtzugqufufn3fem7cpkdlcvu
   eslint-formatter-rdjson: 1.0.5
-  eslint-import-resolver-typescript: 3.5.2_2lbwmhbr7bncddqbzzpg77o75m
-  eslint-plugin-import: 2.26.0_wspzxxdxgd6sryq2cmxnia3diy
-  eslint-plugin-jsx-a11y: 6.6.1_eslint@8.30.0
-  eslint-plugin-prettier: 4.2.1_kl4pe43v5b43npmso5hoplpbyi
-  eslint-plugin-react: 7.31.11_eslint@8.30.0
-  eslint-plugin-react-hooks: 4.6.0_eslint@8.30.0
-  husky: 8.0.2
+  eslint-import-resolver-typescript: 3.5.2_ol7jqilc3wemtdbq3nzhywgxq4
+  eslint-plugin-import: 2.26.0_cxu27kyieece4tnvunezm4whiq
+  eslint-plugin-jsx-a11y: 6.6.1_eslint@8.31.0
+  eslint-plugin-prettier: 4.2.1_32m5uc2milwdw3tnkcq5del26y
+  eslint-plugin-react: 7.31.11_eslint@8.31.0
+  eslint-plugin-react-hooks: 4.6.0_eslint@8.31.0
+  husky: 8.0.3
   jest: 29.3.1_@types+node@18.11.18
   jest-environment-jsdom: 29.3.1
   jest-transform-stub: 2.0.0
@@ -128,11 +126,11 @@ devDependencies:
   prettier: 2.8.1
   react-test-renderer: 18.2.0_react@18.2.0
   typescript: 4.9.4
-  vite: 4.0.3_@types+node@18.11.18
-  vite-plugin-eslint: 1.8.1_eslint@8.30.0+vite@4.0.3
+  vite: 4.0.4_@types+node@18.11.18
+  vite-plugin-eslint: 1.8.1_eslint@8.31.0+vite@4.0.4
   vite-plugin-istanbul: 3.0.4
-  vite-plugin-svgr: 2.4.0_vite@4.0.3
-  vite-tsconfig-paths: 4.0.3_p2fwcaxbionflq6hjivvbcsv5a
+  vite-plugin-svgr: 2.4.0_vite@4.0.4
+  vite-tsconfig-paths: 4.0.3_gl4qsmwzp7wy5uclz4tx77gbli
 
 packages:
 
@@ -182,30 +180,30 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/core/7.20.5:
-    resolution: {integrity: sha512-UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ==}
+  /@babel/core/7.20.12:
+    resolution: {integrity: sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@ampproject/remapping': 2.2.0
       '@babel/code-frame': 7.18.6
-      '@babel/generator': 7.20.5
-      '@babel/helper-compilation-targets': 7.20.0_@babel+core@7.20.5
-      '@babel/helper-module-transforms': 7.20.2
-      '@babel/helpers': 7.20.6
-      '@babel/parser': 7.20.5
-      '@babel/template': 7.18.10
-      '@babel/traverse': 7.20.5
-      '@babel/types': 7.20.5
+      '@babel/generator': 7.20.7
+      '@babel/helper-compilation-targets': 7.20.7_@babel+core@7.20.12
+      '@babel/helper-module-transforms': 7.20.11
+      '@babel/helpers': 7.20.7
+      '@babel/parser': 7.20.7
+      '@babel/template': 7.20.7
+      '@babel/traverse': 7.20.12
+      '@babel/types': 7.20.7
       convert-source-map: 1.8.0
       debug: 4.3.4
       gensync: 1.0.0-beta.2
-      json5: 2.2.1
+      json5: 2.2.3
       semver: 6.3.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/eslint-parser/7.18.2_krbl7gjo3afxleq6arh2klsyza:
+  /@babel/eslint-parser/7.18.2_73v55hpqq5rouuatnxlsrke4km:
     resolution: {integrity: sha512-oFQYkE8SuH14+uR51JVAmdqwKYXGRjEXx7s+WiagVjqQ+HPE+nnwyF2qlVG8evUsUHmPcA+6YXMEDbIhEyQc5A==}
     engines: {node: ^10.13.0 || ^12.13.0 || >=14.0.0}
     peerDependencies:
@@ -216,7 +214,7 @@ packages:
         optional: true
     dependencies:
       '@babel/core': 7.18.6
-      eslint: 8.30.0
+      eslint: 8.31.0
       eslint-scope: 5.1.1
       eslint-visitor-keys: 2.1.0
       semver: 6.3.0
@@ -226,7 +224,16 @@ packages:
     resolution: {integrity: sha512-jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.20.5
+      '@babel/types': 7.20.7
+      '@jridgewell/gen-mapping': 0.3.2
+      jsesc: 2.5.2
+    dev: true
+
+  /@babel/generator/7.20.7:
+    resolution: {integrity: sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.20.7
       '@jridgewell/gen-mapping': 0.3.2
       jsesc: 2.5.2
     dev: true
@@ -235,7 +242,7 @@ packages:
     resolution: {integrity: sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.20.5
+      '@babel/types': 7.20.7
     dev: true
 
   /@babel/helper-builder-binary-assignment-operator-visitor/7.18.6:
@@ -243,7 +250,7 @@ packages:
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/helper-explode-assignable-expression': 7.18.6
-      '@babel/types': 7.20.5
+      '@babel/types': 7.20.7
     dev: true
 
   /@babel/helper-compilation-targets/7.20.0_@babel+core@7.18.6:
@@ -262,8 +269,8 @@ packages:
       semver: 6.3.0
     dev: true
 
-  /@babel/helper-compilation-targets/7.20.0_@babel+core@7.20.5:
-    resolution: {integrity: sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==}
+  /@babel/helper-compilation-targets/7.20.7_@babel+core@7.20.12:
+    resolution: {integrity: sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
@@ -272,13 +279,14 @@ packages:
         optional: true
     dependencies:
       '@babel/compat-data': 7.20.5
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-validator-option': 7.18.6
       browserslist: 4.21.4
+      lru-cache: 5.1.1
       semver: 6.3.0
     dev: true
 
-  /@babel/helper-create-class-features-plugin/7.18.6_@babel+core@7.20.5:
+  /@babel/helper-create-class-features-plugin/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-YfDzdnoxHGV8CzqHGyCbFvXg5QESPFkXlHtvdCkesLjjVMT2Adxe4FGUR5ChIb3DxSaXO12iIOCWoXdsUVwnqw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -287,7 +295,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-annotate-as-pure': 7.18.6
       '@babel/helper-environment-visitor': 7.18.9
       '@babel/helper-function-name': 7.19.0
@@ -299,7 +307,7 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/helper-create-regexp-features-plugin/7.18.6_@babel+core@7.20.5:
+  /@babel/helper-create-regexp-features-plugin/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-7LcpH1wnQLGrI+4v+nPp+zUvIkF9x0ddv1Hkdue10tg3gmRnLy97DXh4STiOf1qeIInyD69Qv5kKSZzKD8B/7A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -308,12 +316,12 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-annotate-as-pure': 7.18.6
       regexpu-core: 5.1.0
     dev: true
 
-  /@babel/helper-define-polyfill-provider/0.3.1_@babel+core@7.20.5:
+  /@babel/helper-define-polyfill-provider/0.3.1_@babel+core@7.20.12:
     resolution: {integrity: sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==}
     peerDependencies:
       '@babel/core': ^7.4.0-0
@@ -321,11 +329,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
-      '@babel/helper-compilation-targets': 7.20.0_@babel+core@7.20.5
+      '@babel/core': 7.20.12
+      '@babel/helper-compilation-targets': 7.20.7_@babel+core@7.20.12
       '@babel/helper-module-imports': 7.18.6
       '@babel/helper-plugin-utils': 7.19.0
-      '@babel/traverse': 7.20.5
+      '@babel/traverse': 7.20.12
       debug: 4.3.4
       lodash.debounce: 4.0.8
       resolve: 1.22.1
@@ -343,36 +351,52 @@ packages:
     resolution: {integrity: sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.20.5
+      '@babel/types': 7.20.7
     dev: true
 
   /@babel/helper-function-name/7.19.0:
     resolution: {integrity: sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/template': 7.18.10
-      '@babel/types': 7.20.5
+      '@babel/template': 7.20.7
+      '@babel/types': 7.20.7
     dev: true
 
   /@babel/helper-hoist-variables/7.18.6:
     resolution: {integrity: sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.20.5
+      '@babel/types': 7.20.7
     dev: true
 
   /@babel/helper-member-expression-to-functions/7.18.6:
     resolution: {integrity: sha512-CeHxqwwipekotzPDUuJOfIMtcIHBuc7WAzLmTYWctVigqS5RktNMQ5bEwQSuGewzYnCtTWa3BARXeiLxDTv+Ng==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.20.5
+      '@babel/types': 7.20.7
     dev: true
 
   /@babel/helper-module-imports/7.18.6:
     resolution: {integrity: sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.20.5
+      '@babel/types': 7.20.7
+
+  /@babel/helper-module-transforms/7.20.11:
+    resolution: {integrity: sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-environment-visitor': 7.18.9
+      '@babel/helper-module-imports': 7.18.6
+      '@babel/helper-simple-access': 7.20.2
+      '@babel/helper-split-export-declaration': 7.18.6
+      '@babel/helper-validator-identifier': 7.19.1
+      '@babel/template': 7.20.7
+      '@babel/traverse': 7.20.12
+      '@babel/types': 7.20.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
 
   /@babel/helper-module-transforms/7.20.2:
     resolution: {integrity: sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==}
@@ -383,9 +407,9 @@ packages:
       '@babel/helper-simple-access': 7.20.2
       '@babel/helper-split-export-declaration': 7.18.6
       '@babel/helper-validator-identifier': 7.19.1
-      '@babel/template': 7.18.10
-      '@babel/traverse': 7.20.5
-      '@babel/types': 7.20.5
+      '@babel/template': 7.20.7
+      '@babel/traverse': 7.20.12
+      '@babel/types': 7.20.7
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -394,14 +418,14 @@ packages:
     resolution: {integrity: sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.20.5
+      '@babel/types': 7.20.7
     dev: true
 
   /@babel/helper-plugin-utils/7.19.0:
     resolution: {integrity: sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==}
     engines: {node: '>=6.9.0'}
 
-  /@babel/helper-remap-async-to-generator/7.18.6_@babel+core@7.20.5:
+  /@babel/helper-remap-async-to-generator/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-z5wbmV55TveUPZlCLZvxWHtrjuJd+8inFhk7DG0WW87/oJuGDcjDiu7HIvGcpf5464L6xKCg3vNkmlVVz9hwyQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -410,11 +434,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-annotate-as-pure': 7.18.6
       '@babel/helper-environment-visitor': 7.18.9
       '@babel/helper-wrap-function': 7.18.6
-      '@babel/types': 7.20.5
+      '@babel/types': 7.20.7
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -426,8 +450,8 @@ packages:
       '@babel/helper-environment-visitor': 7.18.9
       '@babel/helper-member-expression-to-functions': 7.18.6
       '@babel/helper-optimise-call-expression': 7.18.6
-      '@babel/traverse': 7.20.5
-      '@babel/types': 7.20.5
+      '@babel/traverse': 7.20.12
+      '@babel/types': 7.20.7
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -443,14 +467,14 @@ packages:
     resolution: {integrity: sha512-4KoLhwGS9vGethZpAhYnMejWkX64wsnHPDwvOsKWU6Fg4+AlK2Jz3TyjQLMEPvz+1zemi/WBdkYxCD0bAfIkiw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.20.5
+      '@babel/types': 7.20.7
     dev: true
 
   /@babel/helper-split-export-declaration/7.18.6:
     resolution: {integrity: sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.20.5
+      '@babel/types': 7.20.7
     dev: true
 
   /@babel/helper-string-parser/7.19.4:
@@ -471,9 +495,9 @@ packages:
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/helper-function-name': 7.19.0
-      '@babel/template': 7.18.10
-      '@babel/traverse': 7.20.5
-      '@babel/types': 7.20.5
+      '@babel/template': 7.20.7
+      '@babel/traverse': 7.20.12
+      '@babel/types': 7.20.7
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -482,9 +506,20 @@ packages:
     resolution: {integrity: sha512-Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/template': 7.18.10
-      '@babel/traverse': 7.20.5
-      '@babel/types': 7.20.5
+      '@babel/template': 7.20.7
+      '@babel/traverse': 7.20.12
+      '@babel/types': 7.20.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/helpers/7.20.7:
+    resolution: {integrity: sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/template': 7.20.7
+      '@babel/traverse': 7.20.12
+      '@babel/types': 7.20.7
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -502,10 +537,18 @@ packages:
     engines: {node: '>=6.0.0'}
     hasBin: true
     dependencies:
-      '@babel/types': 7.20.5
+      '@babel/types': 7.20.7
     dev: true
 
-  /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/7.18.6_@babel+core@7.20.5:
+  /@babel/parser/7.20.7:
+    resolution: {integrity: sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+    dependencies:
+      '@babel/types': 7.20.7
+    dev: true
+
+  /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -514,11 +557,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-Udgu8ZRgrBrttVz6A0EVL0SJ1z+RLbIeqsu632SA1hf0awEppD6TvdznoH+orIF8wtFFAV/Enmw9Y+9oV8TQcw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -527,13 +570,13 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
       '@babel/helper-skip-transparent-expression-wrappers': 7.18.6
-      '@babel/plugin-proposal-optional-chaining': 7.18.6_@babel+core@7.20.5
+      '@babel/plugin-proposal-optional-chaining': 7.18.6_@babel+core@7.20.12
     dev: true
 
-  /@babel/plugin-proposal-async-generator-functions/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-proposal-async-generator-functions/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-WAz4R9bvozx4qwf74M+sfqPMKfSqwM0phxPTR6iJIi8robgzXwkEgmeJG1gEKhm6sDqT/U9aV3lfcqybIpev8w==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -542,16 +585,16 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-environment-visitor': 7.18.9
       '@babel/helper-plugin-utils': 7.19.0
-      '@babel/helper-remap-async-to-generator': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.20.5
+      '@babel/helper-remap-async-to-generator': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.20.12
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/plugin-proposal-class-properties/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-proposal-class-properties/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -560,14 +603,14 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
-      '@babel/helper-create-class-features-plugin': 7.18.6_@babel+core@7.20.5
+      '@babel/core': 7.20.12
+      '@babel/helper-create-class-features-plugin': 7.18.6_@babel+core@7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/plugin-proposal-class-static-block/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-proposal-class-static-block/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -576,15 +619,15 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
-      '@babel/helper-create-class-features-plugin': 7.18.6_@babel+core@7.20.5
+      '@babel/core': 7.20.12
+      '@babel/helper-create-class-features-plugin': 7.18.6_@babel+core@7.20.12
       '@babel/helper-plugin-utils': 7.19.0
-      '@babel/plugin-syntax-class-static-block': 7.14.5_@babel+core@7.20.5
+      '@babel/plugin-syntax-class-static-block': 7.14.5_@babel+core@7.20.12
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/plugin-proposal-decorators/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-proposal-decorators/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-gAdhsjaYmiZVxx5vTMiRfj31nB7LhwBJFMSLzeDxc7X4tKLixup0+k9ughn0RcpBrv9E3PBaXJW7jF5TCihAOg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -593,17 +636,17 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
-      '@babel/helper-create-class-features-plugin': 7.18.6_@babel+core@7.20.5
+      '@babel/core': 7.20.12
+      '@babel/helper-create-class-features-plugin': 7.18.6_@babel+core@7.20.12
       '@babel/helper-plugin-utils': 7.19.0
       '@babel/helper-replace-supers': 7.18.6
       '@babel/helper-split-export-declaration': 7.18.6
-      '@babel/plugin-syntax-decorators': 7.18.6_@babel+core@7.20.5
+      '@babel/plugin-syntax-decorators': 7.18.6_@babel+core@7.20.12
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/plugin-proposal-dynamic-import/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-proposal-dynamic-import/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -612,12 +655,12 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
-      '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.20.5
+      '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.20.12
     dev: true
 
-  /@babel/plugin-proposal-export-namespace-from/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-proposal-export-namespace-from/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-zr/QcUlUo7GPo6+X1wC98NJADqmy5QTFWWhqeQWiki4XHafJtLl/YMGkmRB2szDD2IYJCCdBTd4ElwhId9T7Xw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -626,12 +669,12 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
-      '@babel/plugin-syntax-export-namespace-from': 7.8.3_@babel+core@7.20.5
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3_@babel+core@7.20.12
     dev: true
 
-  /@babel/plugin-proposal-json-strings/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-proposal-json-strings/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -640,12 +683,12 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
-      '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.20.5
+      '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.20.12
     dev: true
 
-  /@babel/plugin-proposal-logical-assignment-operators/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-proposal-logical-assignment-operators/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-zMo66azZth/0tVd7gmkxOkOjs2rpHyhpcFo565PUP37hSp6hSd9uUKIfTDFMz58BwqgQKhJ9YxtM5XddjXVn+Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -654,12 +697,12 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.20.5
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.20.12
     dev: true
 
-  /@babel/plugin-proposal-nullish-coalescing-operator/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-proposal-nullish-coalescing-operator/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -668,12 +711,12 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.20.5
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.20.12
     dev: true
 
-  /@babel/plugin-proposal-numeric-separator/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-proposal-numeric-separator/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -682,12 +725,12 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
-      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.20.5
+      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.20.12
     dev: true
 
-  /@babel/plugin-proposal-object-rest-spread/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-proposal-object-rest-spread/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-9yuM6wr4rIsKa1wlUAbZEazkCrgw2sMPEXCr4Rnwetu7cEW1NydkCWytLuYletbf8vFxdJxFhwEZqMpOx2eZyw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -697,14 +740,14 @@ packages:
         optional: true
     dependencies:
       '@babel/compat-data': 7.20.5
-      '@babel/core': 7.20.5
-      '@babel/helper-compilation-targets': 7.20.0_@babel+core@7.20.5
+      '@babel/core': 7.20.12
+      '@babel/helper-compilation-targets': 7.20.7_@babel+core@7.20.12
       '@babel/helper-plugin-utils': 7.19.0
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.20.5
-      '@babel/plugin-transform-parameters': 7.18.8_@babel+core@7.20.5
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.20.12
+      '@babel/plugin-transform-parameters': 7.18.8_@babel+core@7.20.12
     dev: true
 
-  /@babel/plugin-proposal-optional-catch-binding/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-proposal-optional-catch-binding/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -713,12 +756,12 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.20.5
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.20.12
     dev: true
 
-  /@babel/plugin-proposal-optional-chaining/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-proposal-optional-chaining/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-PatI6elL5eMzoypFAiYDpYQyMtXTn+iMhuxxQt5mAXD4fEmKorpSI3PHd+i3JXBJN3xyA6MvJv7at23HffFHwA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -727,13 +770,13 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
       '@babel/helper-skip-transparent-expression-wrappers': 7.18.6
-      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.20.5
+      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.20.12
     dev: true
 
-  /@babel/plugin-proposal-private-methods/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-proposal-private-methods/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -742,14 +785,14 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
-      '@babel/helper-create-class-features-plugin': 7.18.6_@babel+core@7.20.5
+      '@babel/core': 7.20.12
+      '@babel/helper-create-class-features-plugin': 7.18.6_@babel+core@7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/plugin-proposal-private-property-in-object/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-proposal-private-property-in-object/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -758,16 +801,16 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-create-class-features-plugin': 7.18.6_@babel+core@7.20.5
+      '@babel/helper-create-class-features-plugin': 7.18.6_@babel+core@7.20.12
       '@babel/helper-plugin-utils': 7.19.0
-      '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.20.5
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.20.12
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/plugin-proposal-unicode-property-regex/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-proposal-unicode-property-regex/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -776,8 +819,8 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
-      '@babel/helper-create-regexp-features-plugin': 7.18.6_@babel+core@7.20.5
+      '@babel/core': 7.20.12
+      '@babel/helper-create-regexp-features-plugin': 7.18.6_@babel+core@7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
@@ -793,7 +836,7 @@ packages:
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.20.5:
+  /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.20.12:
     resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -801,7 +844,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
@@ -817,7 +860,7 @@ packages:
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-syntax-bigint/7.8.3_@babel+core@7.20.5:
+  /@babel/plugin-syntax-bigint/7.8.3_@babel+core@7.20.12:
     resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -825,7 +868,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
@@ -841,7 +884,7 @@ packages:
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-syntax-class-properties/7.12.13_@babel+core@7.20.5:
+  /@babel/plugin-syntax-class-properties/7.12.13_@babel+core@7.20.12:
     resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -849,11 +892,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-syntax-class-static-block/7.14.5_@babel+core@7.20.5:
+  /@babel/plugin-syntax-class-static-block/7.14.5_@babel+core@7.20.12:
     resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -862,11 +905,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-syntax-decorators/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-syntax-decorators/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-fqyLgjcxf/1yhyZ6A+yo1u9gJ7eleFQod2lkaUsF9DQ7sbbY3Ligym3L0+I2c0WmqNKDpoD9UTb1AKP3qRMOAQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -875,11 +918,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-syntax-dynamic-import/7.8.3_@babel+core@7.20.5:
+  /@babel/plugin-syntax-dynamic-import/7.8.3_@babel+core@7.20.12:
     resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -887,11 +930,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-syntax-export-namespace-from/7.8.3_@babel+core@7.20.5:
+  /@babel/plugin-syntax-export-namespace-from/7.8.3_@babel+core@7.20.12:
     resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -899,11 +942,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-syntax-flow/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-syntax-flow/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -912,11 +955,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-syntax-import-assertions/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-syntax-import-assertions/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -925,7 +968,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
@@ -941,7 +984,7 @@ packages:
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-syntax-import-meta/7.10.4_@babel+core@7.20.5:
+  /@babel/plugin-syntax-import-meta/7.10.4_@babel+core@7.20.12:
     resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -949,7 +992,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
@@ -965,7 +1008,7 @@ packages:
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.20.5:
+  /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.20.12:
     resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -973,7 +1016,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
@@ -989,7 +1032,7 @@ packages:
       '@babel/helper-plugin-utils': 7.19.0
     dev: false
 
-  /@babel/plugin-syntax-jsx/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-syntax-jsx/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -998,7 +1041,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
@@ -1014,7 +1057,7 @@ packages:
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.20.5:
+  /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.20.12:
     resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1022,7 +1065,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
@@ -1038,7 +1081,7 @@ packages:
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.20.5:
+  /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.20.12:
     resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1046,7 +1089,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
@@ -1062,7 +1105,7 @@ packages:
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.20.5:
+  /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.20.12:
     resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1070,7 +1113,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
@@ -1086,7 +1129,7 @@ packages:
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.20.5:
+  /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.20.12:
     resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1094,7 +1137,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
@@ -1110,7 +1153,7 @@ packages:
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.20.5:
+  /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.20.12:
     resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1118,7 +1161,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
@@ -1134,7 +1177,7 @@ packages:
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.20.5:
+  /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.20.12:
     resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1142,11 +1185,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-syntax-private-property-in-object/7.14.5_@babel+core@7.20.5:
+  /@babel/plugin-syntax-private-property-in-object/7.14.5_@babel+core@7.20.12:
     resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1155,7 +1198,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
@@ -1172,7 +1215,7 @@ packages:
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.20.5:
+  /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.20.12:
     resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1181,11 +1224,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-syntax-typescript/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-syntax-typescript/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1194,11 +1237,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-transform-arrow-functions/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-arrow-functions/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1207,11 +1250,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-transform-async-to-generator/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-async-to-generator/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1220,15 +1263,15 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-module-imports': 7.18.6
       '@babel/helper-plugin-utils': 7.19.0
-      '@babel/helper-remap-async-to-generator': 7.18.6_@babel+core@7.20.5
+      '@babel/helper-remap-async-to-generator': 7.18.6_@babel+core@7.20.12
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/plugin-transform-block-scoped-functions/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-block-scoped-functions/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1237,11 +1280,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-transform-block-scoping/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-block-scoping/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-pRqwb91C42vs1ahSAWJkxOxU1RHWDn16XAa6ggQ72wjLlWyYeAcLvTtE0aM8ph3KNydy9CQF2nLYcjq1WysgxQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1250,11 +1293,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-transform-classes/7.18.8_@babel+core@7.20.5:
+  /@babel/plugin-transform-classes/7.18.8_@babel+core@7.20.12:
     resolution: {integrity: sha512-RySDoXdF6hgHSHuAW4aLGyVQdmvEX/iJtjVre52k0pxRq4hzqze+rAVP++NmNv596brBpYmaiKgTZby7ziBnVg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1263,7 +1306,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-annotate-as-pure': 7.18.6
       '@babel/helper-environment-visitor': 7.18.9
       '@babel/helper-function-name': 7.19.0
@@ -1276,7 +1319,7 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/plugin-transform-computed-properties/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-computed-properties/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-9repI4BhNrR0KenoR9vm3/cIc1tSBIo+u1WVjKCAynahj25O8zfbiE6JtAtHPGQSs4yZ+bA8mRasRP+qc+2R5A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1285,11 +1328,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-transform-destructuring/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-destructuring/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-tgy3u6lRp17ilY8r1kP4i2+HDUwxlVqq3RTc943eAWSzGgpU1qhiKpqZ5CMyHReIYPHdo3Kg8v8edKtDqSVEyQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1298,11 +1341,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-transform-dotall-regex/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-dotall-regex/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1311,12 +1354,12 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
-      '@babel/helper-create-regexp-features-plugin': 7.18.6_@babel+core@7.20.5
+      '@babel/core': 7.20.12
+      '@babel/helper-create-regexp-features-plugin': 7.18.6_@babel+core@7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-transform-duplicate-keys/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-duplicate-keys/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-NJU26U/208+sxYszf82nmGYqVF9QN8py2HFTblPT9hbawi8+1C5a9JubODLTGFuT0qlkqVinmkwOD13s0sZktg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1325,11 +1368,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-transform-exponentiation-operator/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-exponentiation-operator/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1338,12 +1381,12 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-builder-binary-assignment-operator-visitor': 7.18.6
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-transform-flow-strip-types/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-flow-strip-types/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-wE0xtA7csz+hw4fKPwxmu5jnzAsXPIO57XnRwzXP3T19jWh1BODnPGoG9xKYwvAwusP7iUktHayRFbMPGtODaQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1352,12 +1395,12 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
-      '@babel/plugin-syntax-flow': 7.18.6_@babel+core@7.20.5
+      '@babel/plugin-syntax-flow': 7.18.6_@babel+core@7.20.12
     dev: true
 
-  /@babel/plugin-transform-for-of/7.18.8_@babel+core@7.20.5:
+  /@babel/plugin-transform-for-of/7.18.8_@babel+core@7.20.12:
     resolution: {integrity: sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1366,11 +1409,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-transform-function-name/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-function-name/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-kJha/Gbs5RjzIu0CxZwf5e3aTTSlhZnHMT8zPWnJMjNpLOUgqevg+PN5oMH68nMCXnfiMo4Bhgxqj59KHTlAnA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1379,13 +1422,13 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
-      '@babel/helper-compilation-targets': 7.20.0_@babel+core@7.20.5
+      '@babel/core': 7.20.12
+      '@babel/helper-compilation-targets': 7.20.7_@babel+core@7.20.12
       '@babel/helper-function-name': 7.19.0
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-transform-literals/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-literals/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-x3HEw0cJZVDoENXOp20HlypIHfl0zMIhMVZEBVTfmqbObIpsMxMbmU5nOEO8R7LYT+z5RORKPlTI5Hj4OsO9/Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1394,11 +1437,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-transform-member-expression-literals/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-member-expression-literals/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1407,11 +1450,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-transform-modules-amd/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-modules-amd/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1420,8 +1463,8 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
-      '@babel/helper-module-transforms': 7.20.2
+      '@babel/core': 7.20.12
+      '@babel/helper-module-transforms': 7.20.11
       '@babel/helper-plugin-utils': 7.19.0
       babel-plugin-dynamic-import-node: 2.3.3
     transitivePeerDependencies:
@@ -1446,7 +1489,7 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/plugin-transform-modules-commonjs/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-modules-commonjs/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1455,7 +1498,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-module-transforms': 7.20.2
       '@babel/helper-plugin-utils': 7.19.0
       '@babel/helper-simple-access': 7.20.2
@@ -1464,7 +1507,7 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/plugin-transform-modules-systemjs/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-modules-systemjs/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-UbPYpXxLjTw6w6yXX2BYNxF3p6QY225wcTkfQCy3OMnSlS/C3xGtwUjEzGkldb/sy6PWLiCQ3NbYfjWUTI3t4g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1473,9 +1516,9 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-hoist-variables': 7.18.6
-      '@babel/helper-module-transforms': 7.20.2
+      '@babel/helper-module-transforms': 7.20.11
       '@babel/helper-plugin-utils': 7.19.0
       '@babel/helper-validator-identifier': 7.19.1
       babel-plugin-dynamic-import-node: 2.3.3
@@ -1483,7 +1526,7 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/plugin-transform-modules-umd/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-modules-umd/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1492,14 +1535,14 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
-      '@babel/helper-module-transforms': 7.20.2
+      '@babel/core': 7.20.12
+      '@babel/helper-module-transforms': 7.20.11
       '@babel/helper-plugin-utils': 7.19.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/plugin-transform-named-capturing-groups-regex/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-named-capturing-groups-regex/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-UmEOGF8XgaIqD74bC8g7iV3RYj8lMf0Bw7NJzvnS9qQhM4mg+1WHKotUIdjxgD2RGrgFLZZPCFPFj3P/kVDYhg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1508,12 +1551,12 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
-      '@babel/helper-create-regexp-features-plugin': 7.18.6_@babel+core@7.20.5
+      '@babel/core': 7.20.12
+      '@babel/helper-create-regexp-features-plugin': 7.18.6_@babel+core@7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-transform-new-target/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-new-target/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1522,11 +1565,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-transform-object-super/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-object-super/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1535,14 +1578,14 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
       '@babel/helper-replace-supers': 7.18.6
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/plugin-transform-parameters/7.18.8_@babel+core@7.20.5:
+  /@babel/plugin-transform-parameters/7.18.8_@babel+core@7.20.12:
     resolution: {integrity: sha512-ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1551,11 +1594,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-transform-property-literals/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-property-literals/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1564,11 +1607,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-transform-react-display-name/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-react-display-name/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1577,11 +1620,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-transform-react-jsx-development/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-react-jsx-development/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1590,11 +1633,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
-      '@babel/plugin-transform-react-jsx': 7.19.0_@babel+core@7.20.5
+      '@babel/core': 7.20.12
+      '@babel/plugin-transform-react-jsx': 7.19.0_@babel+core@7.20.12
     dev: true
 
-  /@babel/plugin-transform-react-jsx-self/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-react-jsx-self/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-A0LQGx4+4Jv7u/tWzoJF7alZwnBDQd6cGLh9P+Ttk4dpiL+J5p7NSNv/9tlEFFJDq3kjxOavWmbm6t0Gk+A3Ig==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1603,11 +1646,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-transform-react-jsx-source/7.19.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-react-jsx-source/7.19.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-RpAi004QyMNisst/pvSanoRdJ4q+jMCWyk9zdw/CyLB9j8RXEahodR6l2GyttDRyEVWZtbN+TpLiHJ3t34LbsQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1616,11 +1659,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-transform-react-jsx/7.19.0_@babel+core@7.20.5:
+  /@babel/plugin-transform-react-jsx/7.19.0_@babel+core@7.20.12:
     resolution: {integrity: sha512-UVEvX3tXie3Szm3emi1+G63jyw1w5IcMY0FSKM+CRnKRI5Mr1YbCNgsSTwoTwKphQEG9P+QqmuRFneJPZuHNhg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1629,15 +1672,15 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-annotate-as-pure': 7.18.6
       '@babel/helper-module-imports': 7.18.6
       '@babel/helper-plugin-utils': 7.19.0
-      '@babel/plugin-syntax-jsx': 7.18.6_@babel+core@7.20.5
-      '@babel/types': 7.20.5
+      '@babel/plugin-syntax-jsx': 7.18.6_@babel+core@7.20.12
+      '@babel/types': 7.20.7
     dev: true
 
-  /@babel/plugin-transform-react-pure-annotations/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-react-pure-annotations/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1646,12 +1689,12 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-annotate-as-pure': 7.18.6
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-transform-regenerator/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-regenerator/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1660,12 +1703,12 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
       regenerator-transform: 0.15.0
     dev: true
 
-  /@babel/plugin-transform-reserved-words/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-reserved-words/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1674,11 +1717,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-transform-runtime/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-runtime/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-8uRHk9ZmRSnWqUgyae249EJZ94b0yAGLBIqzZzl+0iEdbno55Pmlt/32JZsHwXD9k/uZj18Aqqk35wBX4CBTXA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1687,18 +1730,18 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-module-imports': 7.18.6
       '@babel/helper-plugin-utils': 7.19.0
-      babel-plugin-polyfill-corejs2: 0.3.1_@babel+core@7.20.5
-      babel-plugin-polyfill-corejs3: 0.5.2_@babel+core@7.20.5
-      babel-plugin-polyfill-regenerator: 0.3.1_@babel+core@7.20.5
+      babel-plugin-polyfill-corejs2: 0.3.1_@babel+core@7.20.12
+      babel-plugin-polyfill-corejs3: 0.5.2_@babel+core@7.20.12
+      babel-plugin-polyfill-regenerator: 0.3.1_@babel+core@7.20.12
       semver: 6.3.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/plugin-transform-shorthand-properties/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-shorthand-properties/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1707,11 +1750,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-transform-spread/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-spread/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-ayT53rT/ENF8WWexIRg9AiV9h0aIteyWn5ptfZTZQrjk/+f3WdrJGCY4c9wcgl2+MKkKPhzbYp97FTsquZpDCw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1720,12 +1763,12 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
       '@babel/helper-skip-transparent-expression-wrappers': 7.18.6
     dev: true
 
-  /@babel/plugin-transform-sticky-regex/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-sticky-regex/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1734,11 +1777,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-transform-template-literals/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-template-literals/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-UuqlRrQmT2SWRvahW46cGSany0uTlcj8NYOS5sRGYi8FxPYPoLd5DDmMd32ZXEj2Jq+06uGVQKHxa/hJx2EzKw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1747,11 +1790,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-transform-typeof-symbol/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-typeof-symbol/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-7m71iS/QhsPk85xSjFPovHPcH3H9qeyzsujhTc+vcdnsXavoWYJ74zx0lP5RhpC5+iDnVLO+PPMHzC11qels1g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1760,11 +1803,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-transform-typescript/7.18.8_@babel+core@7.20.5:
+  /@babel/plugin-transform-typescript/7.18.8_@babel+core@7.20.12:
     resolution: {integrity: sha512-p2xM8HI83UObjsZGofMV/EdYjamsDm6MoN3hXPYIT0+gxIoopE+B7rPYKAxfrz9K9PK7JafTTjqYC6qipLExYA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1773,15 +1816,15 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
-      '@babel/helper-create-class-features-plugin': 7.18.6_@babel+core@7.20.5
+      '@babel/core': 7.20.12
+      '@babel/helper-create-class-features-plugin': 7.18.6_@babel+core@7.20.12
       '@babel/helper-plugin-utils': 7.19.0
-      '@babel/plugin-syntax-typescript': 7.18.6_@babel+core@7.20.5
+      '@babel/plugin-syntax-typescript': 7.18.6_@babel+core@7.20.12
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/plugin-transform-unicode-escapes/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-unicode-escapes/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-XNRwQUXYMP7VLuy54cr/KS/WeL3AZeORhrmeZ7iewgu+X2eBqmpaLI/hzqr9ZxCeUoq0ASK4GUzSM0BDhZkLFw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1790,11 +1833,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/plugin-transform-unicode-regex/7.18.6_@babel+core@7.20.5:
+  /@babel/plugin-transform-unicode-regex/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1803,12 +1846,12 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
-      '@babel/helper-create-regexp-features-plugin': 7.18.6_@babel+core@7.20.5
+      '@babel/core': 7.20.12
+      '@babel/helper-create-regexp-features-plugin': 7.18.6_@babel+core@7.20.12
       '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
-  /@babel/preset-env/7.18.6_@babel+core@7.20.5:
+  /@babel/preset-env/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-WrthhuIIYKrEFAwttYzgRNQ5hULGmwTj+D6l7Zdfsv5M7IWV/OZbUfbeL++Qrzx1nVJwWROIFhCHRYQV4xbPNw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1818,86 +1861,86 @@ packages:
         optional: true
     dependencies:
       '@babel/compat-data': 7.20.5
-      '@babel/core': 7.20.5
-      '@babel/helper-compilation-targets': 7.20.0_@babel+core@7.20.5
+      '@babel/core': 7.20.12
+      '@babel/helper-compilation-targets': 7.20.7_@babel+core@7.20.12
       '@babel/helper-plugin-utils': 7.19.0
       '@babel/helper-validator-option': 7.18.6
-      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-proposal-async-generator-functions': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-proposal-class-properties': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-proposal-class-static-block': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-proposal-dynamic-import': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-proposal-export-namespace-from': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-proposal-json-strings': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-proposal-logical-assignment-operators': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-proposal-numeric-separator': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-proposal-object-rest-spread': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-proposal-optional-catch-binding': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-proposal-optional-chaining': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-proposal-private-methods': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-proposal-private-property-in-object': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-proposal-unicode-property-regex': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.20.5
-      '@babel/plugin-syntax-class-properties': 7.12.13_@babel+core@7.20.5
-      '@babel/plugin-syntax-class-static-block': 7.14.5_@babel+core@7.20.5
-      '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.20.5
-      '@babel/plugin-syntax-export-namespace-from': 7.8.3_@babel+core@7.20.5
-      '@babel/plugin-syntax-import-assertions': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.20.5
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.20.5
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.20.5
-      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.20.5
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.20.5
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.20.5
-      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.20.5
-      '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.20.5
-      '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.20.5
-      '@babel/plugin-transform-arrow-functions': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-async-to-generator': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-block-scoped-functions': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-block-scoping': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-classes': 7.18.8_@babel+core@7.20.5
-      '@babel/plugin-transform-computed-properties': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-destructuring': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-dotall-regex': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-duplicate-keys': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-exponentiation-operator': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-for-of': 7.18.8_@babel+core@7.20.5
-      '@babel/plugin-transform-function-name': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-literals': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-member-expression-literals': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-modules-amd': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-modules-commonjs': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-modules-systemjs': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-modules-umd': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-named-capturing-groups-regex': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-new-target': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-object-super': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-parameters': 7.18.8_@babel+core@7.20.5
-      '@babel/plugin-transform-property-literals': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-regenerator': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-reserved-words': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-shorthand-properties': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-spread': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-sticky-regex': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-template-literals': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-typeof-symbol': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-unicode-escapes': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-unicode-regex': 7.18.6_@babel+core@7.20.5
-      '@babel/preset-modules': 0.1.5_@babel+core@7.20.5
-      '@babel/types': 7.20.5
-      babel-plugin-polyfill-corejs2: 0.3.1_@babel+core@7.20.5
-      babel-plugin-polyfill-corejs3: 0.5.2_@babel+core@7.20.5
-      babel-plugin-polyfill-regenerator: 0.3.1_@babel+core@7.20.5
+      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-proposal-async-generator-functions': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-proposal-class-properties': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-proposal-class-static-block': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-proposal-dynamic-import': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-proposal-export-namespace-from': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-proposal-json-strings': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-proposal-logical-assignment-operators': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-proposal-numeric-separator': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-proposal-object-rest-spread': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-proposal-optional-catch-binding': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-proposal-optional-chaining': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-proposal-private-methods': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-proposal-private-property-in-object': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-proposal-unicode-property-regex': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.20.12
+      '@babel/plugin-syntax-class-properties': 7.12.13_@babel+core@7.20.12
+      '@babel/plugin-syntax-class-static-block': 7.14.5_@babel+core@7.20.12
+      '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.20.12
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3_@babel+core@7.20.12
+      '@babel/plugin-syntax-import-assertions': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.20.12
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.20.12
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.20.12
+      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.20.12
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.20.12
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.20.12
+      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.20.12
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.20.12
+      '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.20.12
+      '@babel/plugin-transform-arrow-functions': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-async-to-generator': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-block-scoped-functions': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-block-scoping': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-classes': 7.18.8_@babel+core@7.20.12
+      '@babel/plugin-transform-computed-properties': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-destructuring': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-dotall-regex': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-duplicate-keys': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-exponentiation-operator': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-for-of': 7.18.8_@babel+core@7.20.12
+      '@babel/plugin-transform-function-name': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-literals': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-member-expression-literals': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-modules-amd': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-modules-commonjs': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-modules-systemjs': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-modules-umd': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-named-capturing-groups-regex': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-new-target': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-object-super': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-parameters': 7.18.8_@babel+core@7.20.12
+      '@babel/plugin-transform-property-literals': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-regenerator': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-reserved-words': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-shorthand-properties': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-spread': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-sticky-regex': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-template-literals': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-typeof-symbol': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-unicode-escapes': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-unicode-regex': 7.18.6_@babel+core@7.20.12
+      '@babel/preset-modules': 0.1.5_@babel+core@7.20.12
+      '@babel/types': 7.20.7
+      babel-plugin-polyfill-corejs2: 0.3.1_@babel+core@7.20.12
+      babel-plugin-polyfill-corejs3: 0.5.2_@babel+core@7.20.12
+      babel-plugin-polyfill-regenerator: 0.3.1_@babel+core@7.20.12
       core-js-compat: 3.23.4
       semver: 6.3.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/preset-modules/0.1.5_@babel+core@7.20.5:
+  /@babel/preset-modules/0.1.5_@babel+core@7.20.12:
     resolution: {integrity: sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1905,15 +1948,15 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
-      '@babel/plugin-proposal-unicode-property-regex': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-dotall-regex': 7.18.6_@babel+core@7.20.5
-      '@babel/types': 7.20.5
+      '@babel/plugin-proposal-unicode-property-regex': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-dotall-regex': 7.18.6_@babel+core@7.20.12
+      '@babel/types': 7.20.7
       esutils: 2.0.3
     dev: true
 
-  /@babel/preset-react/7.18.6_@babel+core@7.20.5:
+  /@babel/preset-react/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1922,16 +1965,16 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
       '@babel/helper-validator-option': 7.18.6
-      '@babel/plugin-transform-react-display-name': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-react-jsx': 7.19.0_@babel+core@7.20.5
-      '@babel/plugin-transform-react-jsx-development': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-react-pure-annotations': 7.18.6_@babel+core@7.20.5
+      '@babel/plugin-transform-react-display-name': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-react-jsx': 7.19.0_@babel+core@7.20.12
+      '@babel/plugin-transform-react-jsx-development': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-react-pure-annotations': 7.18.6_@babel+core@7.20.12
     dev: true
 
-  /@babel/preset-typescript/7.18.6_@babel+core@7.20.5:
+  /@babel/preset-typescript/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-s9ik86kXBAnD760aybBucdpnLsAt0jK1xqJn2juOn9lkOvSHV60os5hxoVJsPzMQxvnUJFAlkont2DvvaYEBtQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -1940,10 +1983,10 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.19.0
       '@babel/helper-validator-option': 7.18.6
-      '@babel/plugin-transform-typescript': 7.18.8_@babel+core@7.20.5
+      '@babel/plugin-transform-typescript': 7.18.8_@babel+core@7.20.12
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -1975,6 +2018,7 @@ packages:
     engines: {node: '>=6.9.0'}
     dependencies:
       regenerator-runtime: 0.13.11
+    dev: false
 
   /@babel/runtime/7.20.7:
     resolution: {integrity: sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==}
@@ -1987,8 +2031,35 @@ packages:
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/code-frame': 7.18.6
-      '@babel/parser': 7.20.5
-      '@babel/types': 7.20.5
+      '@babel/parser': 7.20.7
+      '@babel/types': 7.20.7
+    dev: true
+
+  /@babel/template/7.20.7:
+    resolution: {integrity: sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/code-frame': 7.18.6
+      '@babel/parser': 7.20.7
+      '@babel/types': 7.20.7
+    dev: true
+
+  /@babel/traverse/7.20.12:
+    resolution: {integrity: sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/code-frame': 7.18.6
+      '@babel/generator': 7.20.7
+      '@babel/helper-environment-visitor': 7.18.9
+      '@babel/helper-function-name': 7.19.0
+      '@babel/helper-hoist-variables': 7.18.6
+      '@babel/helper-split-export-declaration': 7.18.6
+      '@babel/parser': 7.20.7
+      '@babel/types': 7.20.7
+      debug: 4.3.4
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
   /@babel/traverse/7.20.5:
@@ -1996,13 +2067,13 @@ packages:
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/code-frame': 7.18.6
-      '@babel/generator': 7.20.5
+      '@babel/generator': 7.20.7
       '@babel/helper-environment-visitor': 7.18.9
       '@babel/helper-function-name': 7.19.0
       '@babel/helper-hoist-variables': 7.18.6
       '@babel/helper-split-export-declaration': 7.18.6
-      '@babel/parser': 7.20.5
-      '@babel/types': 7.20.5
+      '@babel/parser': 7.20.7
+      '@babel/types': 7.20.7
       debug: 4.3.4
       globals: 11.12.0
     transitivePeerDependencies:
@@ -2016,6 +2087,15 @@ packages:
       '@babel/helper-string-parser': 7.19.4
       '@babel/helper-validator-identifier': 7.19.1
       to-fast-properties: 2.0.0
+    dev: true
+
+  /@babel/types/7.20.7:
+    resolution: {integrity: sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-string-parser': 7.19.4
+      '@babel/helper-validator-identifier': 7.19.1
+      to-fast-properties: 2.0.0
 
   /@bcoe/v8-coverage/0.2.3:
     resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
@@ -2030,16 +2110,16 @@ packages:
       minimist: 1.2.6
     dev: true
 
-  /@commitlint/cli/17.3.0:
-    resolution: {integrity: sha512-/H0md7TsKflKzVPz226VfXzVafJFO1f9+r2KcFvmBu08V0T56lZU1s8WL7/xlxqLMqBTVaBf7Ixtc4bskdEEZg==}
+  /@commitlint/cli/17.4.0_@types+node@18.11.18:
+    resolution: {integrity: sha512-SEY4sYe8yVlgxPP7X0wJb96DBAGBPsCsy6QbqJt/UECbIAjDeDV5xXBV4jnS7T/qMC10sk6Ub9kDhEX0VWvblw==}
     engines: {node: '>=v14'}
     hasBin: true
     dependencies:
-      '@commitlint/format': 17.0.0
-      '@commitlint/lint': 17.3.0
-      '@commitlint/load': 17.3.0
-      '@commitlint/read': 17.2.0
-      '@commitlint/types': 17.0.0
+      '@commitlint/format': 17.4.0
+      '@commitlint/lint': 17.4.0
+      '@commitlint/load': 17.4.0_@types+node@18.11.18
+      '@commitlint/read': 17.4.0
+      '@commitlint/types': 17.4.0
       execa: 5.1.1
       lodash.isfunction: 3.0.9
       resolve-from: 5.0.0
@@ -2048,28 +2128,29 @@ packages:
     transitivePeerDependencies:
       - '@swc/core'
       - '@swc/wasm'
+      - '@types/node'
     dev: true
 
-  /@commitlint/config-conventional/17.3.0:
-    resolution: {integrity: sha512-hgI+fN5xF8nhS9uG/V06xyT0nlcyvHHMkq0kwRSr96vl5BFlRGaL2C0/YY4kQagfU087tmj01bJkG9Ek98Wllw==}
+  /@commitlint/config-conventional/17.4.0:
+    resolution: {integrity: sha512-G4XBf45J4ZMspO4NwBFzY3g/1Kb+B42BcIxeikF8wucQxcyxcmhRdjeQpRpS1XEcBq5pdtEEQFipuB9IuiNFhw==}
     engines: {node: '>=v14'}
     dependencies:
       conventional-changelog-conventionalcommits: 5.0.0
     dev: true
 
-  /@commitlint/config-validator/17.1.0:
-    resolution: {integrity: sha512-Q1rRRSU09ngrTgeTXHq6ePJs2KrI+axPTgkNYDWSJIuS1Op4w3J30vUfSXjwn5YEJHklK3fSqWNHmBhmTR7Vdg==}
+  /@commitlint/config-validator/17.4.0:
+    resolution: {integrity: sha512-Sa/+8KNpDXz4zT4bVbz2fpFjvgkPO6u2V2fP4TKgt6FjmOw2z3eEX859vtfeaTav/ukBw0/0jr+5ZTZp9zCBhA==}
     engines: {node: '>=v14'}
     dependencies:
-      '@commitlint/types': 17.0.0
+      '@commitlint/types': 17.4.0
       ajv: 8.11.0
     dev: true
 
-  /@commitlint/ensure/17.3.0:
-    resolution: {integrity: sha512-kWbrQHDoW5veIUQx30gXoLOCjWvwC6OOEofhPCLl5ytRPBDAQObMbxTha1Bt2aSyNE/IrJ0s0xkdZ1Gi3wJwQg==}
+  /@commitlint/ensure/17.4.0:
+    resolution: {integrity: sha512-7oAxt25je0jeQ/E0O/M8L3ADb1Cvweu/5lc/kYF8g/kXatI0wxGE5La52onnAUAWeWlsuvBNar15WcrmDmr5Mw==}
     engines: {node: '>=v14'}
     dependencies:
-      '@commitlint/types': 17.0.0
+      '@commitlint/types': 17.4.0
       lodash.camelcase: 4.3.0
       lodash.kebabcase: 4.1.1
       lodash.snakecase: 4.1.1
@@ -2077,122 +2158,122 @@ packages:
       lodash.upperfirst: 4.3.1
     dev: true
 
-  /@commitlint/execute-rule/17.0.0:
-    resolution: {integrity: sha512-nVjL/w/zuqjCqSJm8UfpNaw66V9WzuJtQvEnCrK4jDw6qKTmZB+1JQ8m6BQVZbNBcwfYdDNKnhIhqI0Rk7lgpQ==}
+  /@commitlint/execute-rule/17.4.0:
+    resolution: {integrity: sha512-LIgYXuCSO5Gvtc0t9bebAMSwd68ewzmqLypqI2Kke1rqOqqDbMpYcYfoPfFlv9eyLIh4jocHWwCK5FS7z9icUA==}
     engines: {node: '>=v14'}
     dev: true
 
-  /@commitlint/format/17.0.0:
-    resolution: {integrity: sha512-MZzJv7rBp/r6ZQJDEodoZvdRM0vXu1PfQvMTNWFb8jFraxnISMTnPBWMMjr2G/puoMashwaNM//fl7j8gGV5lA==}
+  /@commitlint/format/17.4.0:
+    resolution: {integrity: sha512-Z2bWAU5+f1YZh9W76c84J8iLIWIvvm+mzqogTz0Nsc1x6EHW0Z2gI38g5HAjB0r0I3ZjR15IDEJKhsxyblcyhA==}
     engines: {node: '>=v14'}
     dependencies:
-      '@commitlint/types': 17.0.0
+      '@commitlint/types': 17.4.0
       chalk: 4.1.2
     dev: true
 
-  /@commitlint/is-ignored/17.2.0:
-    resolution: {integrity: sha512-rgUPUQraHxoMLxiE8GK430HA7/R2vXyLcOT4fQooNrZq9ERutNrP6dw3gdKLkq22Nede3+gEHQYUzL4Wu75ndg==}
+  /@commitlint/is-ignored/17.4.0:
+    resolution: {integrity: sha512-mkRuBlPUaBimvSvJyIHEHEW1/jP1SqEI7NOoaO9/eyJkMbsaiv5b1QgDYL4ZXlHdS64RMV7Y21MVVzuIceImDA==}
     engines: {node: '>=v14'}
     dependencies:
-      '@commitlint/types': 17.0.0
-      semver: 7.3.7
+      '@commitlint/types': 17.4.0
+      semver: 7.3.8
     dev: true
 
-  /@commitlint/lint/17.3.0:
-    resolution: {integrity: sha512-VilOTPg0i9A7CCWM49E9bl5jytfTvfTxf9iwbWAWNjxJ/A5mhPKbm3sHuAdwJ87tDk1k4j8vomYfH23iaY+1Rw==}
+  /@commitlint/lint/17.4.0:
+    resolution: {integrity: sha512-HG2YT4TUbQKs9v8QvpQjJ6OK+fhflsDB8M+D5tLrY79hbQOWA9mDKdRkABsW/AAhpNI9+zeGUWF3jj245jSHKw==}
     engines: {node: '>=v14'}
     dependencies:
-      '@commitlint/is-ignored': 17.2.0
-      '@commitlint/parse': 17.2.0
-      '@commitlint/rules': 17.3.0
-      '@commitlint/types': 17.0.0
+      '@commitlint/is-ignored': 17.4.0
+      '@commitlint/parse': 17.4.0
+      '@commitlint/rules': 17.4.0
+      '@commitlint/types': 17.4.0
     dev: true
 
-  /@commitlint/load/17.3.0:
-    resolution: {integrity: sha512-u/pV6rCAJrCUN+HylBHLzZ4qj1Ew3+eN9GBPhNi9otGxtOfA8b+8nJSxaNbcC23Ins/kcpjGf9zPSVW7628Umw==}
+  /@commitlint/load/17.4.0_@types+node@18.11.18:
+    resolution: {integrity: sha512-wDKNvAJqukqZqKmhRlf3KNo/12QGo1AQcd80EbV01SxtGvyHOsJ/g+/IbrZpopZv8rvzmEVktcpfDYH6ITepFA==}
     engines: {node: '>=v14'}
     dependencies:
-      '@commitlint/config-validator': 17.1.0
-      '@commitlint/execute-rule': 17.0.0
-      '@commitlint/resolve-extends': 17.3.0
-      '@commitlint/types': 17.0.0
-      '@types/node': 14.18.26
+      '@commitlint/config-validator': 17.4.0
+      '@commitlint/execute-rule': 17.4.0
+      '@commitlint/resolve-extends': 17.4.0
+      '@commitlint/types': 17.4.0
       chalk: 4.1.2
-      cosmiconfig: 7.0.1
-      cosmiconfig-typescript-loader: 4.0.0_64g3pvarf3oduwh7nnbyl3yqm4
+      cosmiconfig: 8.0.0
+      cosmiconfig-typescript-loader: 4.0.0_ubnk2r5xvemv3ydnuibh5f2mpu
       lodash.isplainobject: 4.0.6
       lodash.merge: 4.6.2
       lodash.uniq: 4.5.0
       resolve-from: 5.0.0
-      ts-node: 10.9.0_hylbnkdpdgf7fwrtnxxops6eba
+      ts-node: 10.9.0_awa2wsr5thmg3i7jqycphctjfq
       typescript: 4.9.4
     transitivePeerDependencies:
       - '@swc/core'
       - '@swc/wasm'
+      - '@types/node'
     dev: true
 
-  /@commitlint/message/17.2.0:
-    resolution: {integrity: sha512-/4l2KFKxBOuoEn1YAuuNNlAU05Zt7sNsC9H0mPdPm3chOrT4rcX0pOqrQcLtdMrMkJz0gC7b3SF80q2+LtdL9Q==}
+  /@commitlint/message/17.4.0:
+    resolution: {integrity: sha512-USGJDU9PPxcgQjKXCzvPUal65KAhxWq3hp+MrU1pNCN2itWM654CLIoY2LMIQ7rScTli9B5dTLH3vXhzbItmzA==}
     engines: {node: '>=v14'}
     dev: true
 
-  /@commitlint/parse/17.2.0:
-    resolution: {integrity: sha512-vLzLznK9Y21zQ6F9hf8D6kcIJRb2haAK5T/Vt1uW2CbHYOIfNsR/hJs0XnF/J9ctM20Tfsqv4zBitbYvVw7F6Q==}
+  /@commitlint/parse/17.4.0:
+    resolution: {integrity: sha512-x8opKc5p+Hgs+CrMbq3VAnW2L2foPAX6arW8u9c8nTzksldGgFsENT+XVyPmpSMLlVBswZ1tndcz1xyKiY9TJA==}
     engines: {node: '>=v14'}
     dependencies:
-      '@commitlint/types': 17.0.0
+      '@commitlint/types': 17.4.0
       conventional-changelog-angular: 5.0.13
       conventional-commits-parser: 3.2.4
     dev: true
 
-  /@commitlint/read/17.2.0:
-    resolution: {integrity: sha512-bbblBhrHkjxra3ptJNm0abxu7yeAaxumQ8ZtD6GIVqzURCETCP7Dm0tlVvGRDyXBuqX6lIJxh3W7oyKqllDsHQ==}
+  /@commitlint/read/17.4.0:
+    resolution: {integrity: sha512-pGDeZpbkyvhxK8ZoCDUacPPRpauKPWF3n2XpDBEnuGreqUF2clq2PVJpwMMaNN5cHW8iFKCbcoOjXhD01sln0A==}
     engines: {node: '>=v14'}
     dependencies:
-      '@commitlint/top-level': 17.0.0
-      '@commitlint/types': 17.0.0
-      fs-extra: 10.1.0
+      '@commitlint/top-level': 17.4.0
+      '@commitlint/types': 17.4.0
+      fs-extra: 11.1.0
       git-raw-commits: 2.0.11
       minimist: 1.2.6
     dev: true
 
-  /@commitlint/resolve-extends/17.3.0:
-    resolution: {integrity: sha512-Lf3JufJlc5yVEtJWC8o4IAZaB8FQAUaVlhlAHRACd0TTFizV2Lk2VH70et23KgvbQNf7kQzHs/2B4QZalBv6Cg==}
+  /@commitlint/resolve-extends/17.4.0:
+    resolution: {integrity: sha512-3JsmwkrCzoK8sO22AzLBvNEvC1Pmdn/65RKXzEtQMy6oYMl0Snrq97a5bQQEFETF0VsvbtUuKttLqqgn99OXRQ==}
     engines: {node: '>=v14'}
     dependencies:
-      '@commitlint/config-validator': 17.1.0
-      '@commitlint/types': 17.0.0
+      '@commitlint/config-validator': 17.4.0
+      '@commitlint/types': 17.4.0
       import-fresh: 3.3.0
       lodash.mergewith: 4.6.2
       resolve-from: 5.0.0
       resolve-global: 1.0.0
     dev: true
 
-  /@commitlint/rules/17.3.0:
-    resolution: {integrity: sha512-s2UhDjC5yP2utx3WWqsnZRzjgzAX8BMwr1nltC0u0p8T/nzpkx4TojEfhlsOUj1t7efxzZRjUAV0NxNwdJyk+g==}
+  /@commitlint/rules/17.4.0:
+    resolution: {integrity: sha512-lz3i1jet2NNjTWpAMwjjQjMZCPWBIHK1Kkja9o09UmUtMjRdALTb8uMLe8gCyeq3DiiZ5lLYOhbsoPK56xGQKA==}
     engines: {node: '>=v14'}
     dependencies:
-      '@commitlint/ensure': 17.3.0
-      '@commitlint/message': 17.2.0
-      '@commitlint/to-lines': 17.0.0
-      '@commitlint/types': 17.0.0
+      '@commitlint/ensure': 17.4.0
+      '@commitlint/message': 17.4.0
+      '@commitlint/to-lines': 17.4.0
+      '@commitlint/types': 17.4.0
       execa: 5.1.1
     dev: true
 
-  /@commitlint/to-lines/17.0.0:
-    resolution: {integrity: sha512-nEi4YEz04Rf2upFbpnEorG8iymyH7o9jYIVFBG1QdzebbIFET3ir+8kQvCZuBE5pKCtViE4XBUsRZz139uFrRQ==}
+  /@commitlint/to-lines/17.4.0:
+    resolution: {integrity: sha512-LcIy/6ZZolsfwDUWfN1mJ+co09soSuNASfKEU5sCmgFCvX5iHwRYLiIuoqXzOVDYOy7E7IcHilr/KS0e5T+0Hg==}
     engines: {node: '>=v14'}
     dev: true
 
-  /@commitlint/top-level/17.0.0:
-    resolution: {integrity: sha512-dZrEP1PBJvodNWYPOYiLWf6XZergdksKQaT6i1KSROLdjf5Ai0brLOv5/P+CPxBeoj3vBxK4Ax8H1Pg9t7sHIQ==}
+  /@commitlint/top-level/17.4.0:
+    resolution: {integrity: sha512-/1loE/g+dTTQgHnjoCy0AexKAEFyHsR2zRB4NWrZ6lZSMIxAhBJnmCqwao7b4H8888PsfoTBCLBYIw8vGnej8g==}
     engines: {node: '>=v14'}
     dependencies:
       find-up: 5.0.0
     dev: true
 
-  /@commitlint/types/17.0.0:
-    resolution: {integrity: sha512-hBAw6U+SkAT5h47zDMeOu3HSiD0SODw4Aq7rRNh1ceUmL7GyLKYhPbUvlRWqZ65XjBLPHZhFyQlRaPNz8qvUyQ==}
+  /@commitlint/types/17.4.0:
+    resolution: {integrity: sha512-2NjAnq5IcxY9kXtUeO2Ac0aPpvkuOmwbH/BxIm36XXK5LtWFObWJWjXOA+kcaABMrthjWu6la+FUpyYFMHRvbA==}
     engines: {node: '>=v14'}
     dependencies:
       chalk: 4.1.2
@@ -2215,7 +2296,7 @@ packages:
     dependencies:
       '@babel/helper-module-imports': 7.18.6
       '@babel/plugin-syntax-jsx': 7.18.6
-      '@babel/runtime': 7.20.6
+      '@babel/runtime': 7.20.7
       '@emotion/hash': 0.9.0
       '@emotion/memoize': 0.8.0
       '@emotion/serialize': 1.1.1
@@ -2333,8 +2414,8 @@ packages:
     resolution: {integrity: sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg==}
     dev: false
 
-  /@esbuild/android-arm/0.16.10:
-    resolution: {integrity: sha512-RmJjQTRrO6VwUWDrzTBLmV4OJZTarYsiepLGlF2rYTVB701hSorPywPGvP6d8HCuuRibyXa5JX4s3jN2kHEtjQ==}
+  /@esbuild/android-arm/0.16.14:
+    resolution: {integrity: sha512-u0rITLxFIeYAvtJXBQNhNuV4YZe+MD1YvIWT7Nicj8hZAtRVZk2PgNH6KclcKDVHz1ChLKXRfX7d7tkbQBUfrg==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [android]
@@ -2342,8 +2423,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/android-arm64/0.16.10:
-    resolution: {integrity: sha512-47Y+NwVKTldTlDhSgJHZ/RpvBQMUDG7eKihqaF/u6g7s0ZPz4J1vy8A3rwnnUOF2CuDn7w7Gj/QcMoWz3U3SJw==}
+  /@esbuild/android-arm64/0.16.14:
+    resolution: {integrity: sha512-hTqB6Iq13pW4xaydeqQrs8vPntUnMjbkq+PgGiBMi69eYk74naG2ftHWqKnxn874kNrt5Or3rQ0PJutx2doJuQ==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [android]
@@ -2351,8 +2432,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/android-x64/0.16.10:
-    resolution: {integrity: sha512-C4PfnrBMcuAcOurQzpF1tTtZz94IXO5JmICJJ3NFJRHbXXsQUg9RFG45KvydKqtFfBaFLCHpduUkUfXwIvGnRg==}
+  /@esbuild/android-x64/0.16.14:
+    resolution: {integrity: sha512-jir51K4J0K5Rt0KOcippjSNdOl7akKDVz5I6yrqdk4/m9y+rldGptQUF7qU4YpX8U61LtR+w2Tu2Ph+K/UaJOw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [android]
@@ -2360,8 +2441,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/darwin-arm64/0.16.10:
-    resolution: {integrity: sha512-bH/bpFwldyOKdi9HSLCLhhKeVgRYr9KblchwXgY2NeUHBB/BzTUHtUSBgGBmpydB1/4E37m+ggXXfSrnD7/E7g==}
+  /@esbuild/darwin-arm64/0.16.14:
+    resolution: {integrity: sha512-vrlaP81IuwPaw1fyX8fHCmivP3Gr73ojVEZy+oWJLAiZVcG8o8Phwun/XDnYIFUHxIoUnMFEpg9o38MIvlw8zw==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [darwin]
@@ -2369,8 +2450,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/darwin-x64/0.16.10:
-    resolution: {integrity: sha512-OXt7ijoLuy+AjDSKQWu+KdDFMBbdeaL6wtgMKtDUXKWHiAMKHan5+R1QAG6HD4+K0nnOvEJXKHeA9QhXNAjOTQ==}
+  /@esbuild/darwin-x64/0.16.14:
+    resolution: {integrity: sha512-KV1E01eC2hGYA2qzFDRCK4wdZCRUvMwCNcobgpiiOzp5QXpJBqFPdxI69j8vvzuU7oxFXDgANwEkXvpeQqyOyg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [darwin]
@@ -2378,8 +2459,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/freebsd-arm64/0.16.10:
-    resolution: {integrity: sha512-shSQX/3GHuspE3Uxtq5kcFG/zqC+VuMnJkqV7LczO41cIe6CQaXHD3QdMLA4ziRq/m0vZo7JdterlgbmgNIAlQ==}
+  /@esbuild/freebsd-arm64/0.16.14:
+    resolution: {integrity: sha512-xRM1RQsazSvL42BNa5XC7ytD4ZDp0ZyJcH7aB0SlYUcHexJUKiDNKR7dlRVlpt6W0DvoRPU2nWK/9/QWS4u2fw==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [freebsd]
@@ -2387,8 +2468,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/freebsd-x64/0.16.10:
-    resolution: {integrity: sha512-5YVc1zdeaJGASijZmTzSO4h6uKzsQGG3pkjI6fuXvolhm3hVRhZwnHJkforaZLmzvNv5Tb7a3QL2FAVmrgySIA==}
+  /@esbuild/freebsd-x64/0.16.14:
+    resolution: {integrity: sha512-7ALTAn6YRRf1O6fw9jmn0rWmOx3XfwDo7njGtjy1LXhDGUjTY/vohEPM3ii5MQ411vJv1r498EEx2aBQTJcrEw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [freebsd]
@@ -2396,8 +2477,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-arm/0.16.10:
-    resolution: {integrity: sha512-c360287ZWI2miBnvIj23bPyVctgzeMT2kQKR+x94pVqIN44h3GF8VMEs1SFPH1UgyDr3yBbx3vowDS1SVhyVhA==}
+  /@esbuild/linux-arm/0.16.14:
+    resolution: {integrity: sha512-X6xULug66ulrr4IzrW7qq+eq9n4MtEyagdWvj4o4cmWr+JXOT47atjpDF9j5M2zHY0UQBmqnHhwl+tXpkpIb2w==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [linux]
@@ -2405,8 +2486,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-arm64/0.16.10:
-    resolution: {integrity: sha512-2aqeNVxIaRfPcIaMZIFoblLh588sWyCbmj1HHCCs9WmeNWm+EIN0SmvsmPvTa/TsNZFKnxTcvkX2eszTcCqIrA==}
+  /@esbuild/linux-arm64/0.16.14:
+    resolution: {integrity: sha512-TLh2OcbBUQcMYRH4GbiDkDZfZ4t1A3GgmeXY27dHSI6xrU7IkO00MGBiJySmEV6sH3Wa6pAN6UtaVL0DwkGW4Q==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [linux]
@@ -2414,8 +2495,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-ia32/0.16.10:
-    resolution: {integrity: sha512-sqMIEWeyrLGU7J5RB5fTkLRIFwsgsQ7ieWXlDLEmC2HblPYGb3AucD7inw2OrKFpRPKsec1l+lssiM3+NV5aOw==}
+  /@esbuild/linux-ia32/0.16.14:
+    resolution: {integrity: sha512-oBZkcZ56UZDFCAfE3Fd/Jgy10EoS7Td77NzNGenM+HSY8BkdQAcI9VF9qgwdOLZ+tuftWD7UqZ26SAhtvA3XhA==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [linux]
@@ -2423,8 +2504,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-loong64/0.16.10:
-    resolution: {integrity: sha512-O7Pd5hLEtTg37NC73pfhUOGTjx/+aXu5YoSq3ahCxcN7Bcr2F47mv+kG5t840thnsEzrv0oB70+LJu3gUgchvg==}
+  /@esbuild/linux-loong64/0.16.14:
+    resolution: {integrity: sha512-udz/aEHTcuHP+xdWOJmZ5C9RQXHfZd/EhCnTi1Hfay37zH3lBxn/fNs85LA9HlsniFw2zccgcbrrTMKk7Cn1Qg==}
     engines: {node: '>=12'}
     cpu: [loong64]
     os: [linux]
@@ -2432,8 +2513,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-mips64el/0.16.10:
-    resolution: {integrity: sha512-FN8mZOH7531iPHM0kaFhAOqqNHoAb6r/YHW2ZIxNi0a85UBi2DO4Vuyn7t1p4UN8a4LoAnLOT1PqNgHkgBJgbA==}
+  /@esbuild/linux-mips64el/0.16.14:
+    resolution: {integrity: sha512-kJ2iEnikUOdC1SiTGbH0fJUgpZwa0ITDTvj9EHf9lm3I0hZ4Yugsb3M6XSl696jVxrEocLe519/8CbSpQWFSrg==}
     engines: {node: '>=12'}
     cpu: [mips64el]
     os: [linux]
@@ -2441,8 +2522,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-ppc64/0.16.10:
-    resolution: {integrity: sha512-Dg9RiqdvHOAWnOKIOTsIx8dFX9EDlY2IbPEY7YFzchrCiTZmMkD7jWA9UdZbNUygPjdmQBVPRCrLydReFlX9yg==}
+  /@esbuild/linux-ppc64/0.16.14:
+    resolution: {integrity: sha512-kclKxvZvX5YhykwlJ/K9ljiY4THe5vXubXpWmr7q3Zu3WxKnUe1VOZmhkEZlqtnJx31GHPEV4SIG95IqTdfgfg==}
     engines: {node: '>=12'}
     cpu: [ppc64]
     os: [linux]
@@ -2450,8 +2531,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-riscv64/0.16.10:
-    resolution: {integrity: sha512-XMqtpjwzbmlar0BJIxmzu/RZ7EWlfVfH68Vadrva0Wj5UKOdKvqskuev2jY2oPV3aoQUyXwnMbMrFmloO2GfAw==}
+  /@esbuild/linux-riscv64/0.16.14:
+    resolution: {integrity: sha512-fdwP9Dc+Kx/cZwp9T9kNqjAE/PQjfrxbio4rZ3XnC3cVvZBjuxpkiyu/tuCwt6SbAK5th6AYNjFdEV9kGC020A==}
     engines: {node: '>=12'}
     cpu: [riscv64]
     os: [linux]
@@ -2459,8 +2540,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-s390x/0.16.10:
-    resolution: {integrity: sha512-fu7XtnoeRNFMx8DjK3gPWpFBDM2u5ba+FYwg27SjMJwKvJr4bDyKz5c+FLXLUSSAkMAt/UL+cUbEbra+rYtUgw==}
+  /@esbuild/linux-s390x/0.16.14:
+    resolution: {integrity: sha512-++fw3P4fQk9nqvdzbANRqimKspL8pDCnSpXomyhV7V/ISha/BZIYvZwLBWVKp9CVWKwWPJ4ktsezuLIvlJRHqA==}
     engines: {node: '>=12'}
     cpu: [s390x]
     os: [linux]
@@ -2468,8 +2549,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-x64/0.16.10:
-    resolution: {integrity: sha512-61lcjVC/RldNNMUzQQdyCWjCxp9YLEQgIxErxU9XluX7juBdGKb0pvddS0vPNuCvotRbzijZ1pzII+26haWzbA==}
+  /@esbuild/linux-x64/0.16.14:
+    resolution: {integrity: sha512-TomtswAuzBf2NnddlrS4W01Tv85RM9YtATB3OugY6On0PLM4Ksz5qvQKVAjtzPKoLgL1FiZtfc8mkZc4IgoMEA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [linux]
@@ -2477,8 +2558,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/netbsd-x64/0.16.10:
-    resolution: {integrity: sha512-JeZXCX3viSA9j4HqSoygjssdqYdfHd6yCFWyfSekLbz4Ef+D2EjvsN02ZQPwYl5a5gg/ehdHgegHhlfOFP0HCA==}
+  /@esbuild/netbsd-x64/0.16.14:
+    resolution: {integrity: sha512-U06pfx8P5CqyoPNfqIJmnf+5/r4mJ1S62G4zE6eOjS59naQcxi6GnscUCPH3b+hRG0qdKoGX49RAyiqW+M9aSw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [netbsd]
@@ -2486,8 +2567,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/openbsd-x64/0.16.10:
-    resolution: {integrity: sha512-3qpxQKuEVIIg8SebpXsp82OBrqjPV/OwNWmG+TnZDr3VGyChNnGMHccC1xkbxCHDQNnnXjxhMQNyHmdFJbmbRA==}
+  /@esbuild/openbsd-x64/0.16.14:
+    resolution: {integrity: sha512-/Jl8XVaWEZNu9rZw+n792GIBupQwHo6GDoapHSb/2xp/Ku28eK6QpR2O9cPBkzHH4OOoMH0LB6zg/qczJ5TTGg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [openbsd]
@@ -2495,8 +2576,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/sunos-x64/0.16.10:
-    resolution: {integrity: sha512-z+q0xZ+et/7etz7WoMyXTHZ1rB8PMSNp/FOqURLJLOPb3GWJ2aj4oCqFCjPwEbW1rsT7JPpxeH/DwGAWk/I1Bg==}
+  /@esbuild/sunos-x64/0.16.14:
+    resolution: {integrity: sha512-2iI7D34uTbDn/TaSiUbEHz+fUa8KbN90vX5yYqo12QGpu6T8Jl+kxODsWuMCwoTVlqUpwfPV22nBbFPME9OPtw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [sunos]
@@ -2504,8 +2585,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/win32-arm64/0.16.10:
-    resolution: {integrity: sha512-+YYu5sbQ9npkNT9Dec+tn1F/kjg6SMgr6bfi/6FpXYZvCRfu2YFPZGb+3x8K30s8eRxFpoG4sGhiSUkr1xbHEw==}
+  /@esbuild/win32-arm64/0.16.14:
+    resolution: {integrity: sha512-SjlM7AHmQVTiGBJE/nqauY1aDh80UBsXZ94g4g60CDkrDMseatiqALVcIuElg4ZSYzJs8hsg5W6zS2zLpZTVgg==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [win32]
@@ -2513,8 +2594,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/win32-ia32/0.16.10:
-    resolution: {integrity: sha512-Aw7Fupk7XNehR1ftHGYwUteyJ2q+em/aE+fVU3YMTBN2V5A7Z4aVCSV+SvCp9HIIHZavPFBpbdP3VfjQpdf6Xg==}
+  /@esbuild/win32-ia32/0.16.14:
+    resolution: {integrity: sha512-z06t5zqk8ak0Xom5HG81z2iOQ1hNWYsFQp3sczVLVx+dctWdgl80tNRyTbwjaFfui2vFO12dfE3trCTvA+HO4g==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [win32]
@@ -2522,8 +2603,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/win32-x64/0.16.10:
-    resolution: {integrity: sha512-qddWullt3sC1EIpfHvCRBq3H4g3L86DZpD6n8k2XFjFVyp01D++uNbN1hT/JRsHxTbyyemZcpwL5aRlJwc/zFw==}
+  /@esbuild/win32-x64/0.16.14:
+    resolution: {integrity: sha512-ED1UpWcM6lAbalbbQ9TrGqJh4Y9TaASUvu8bI/0mgJcxhSByJ6rbpgqRhxYMaQ682WfA71nxUreaTO7L275zrw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [win32]
@@ -2531,8 +2612,8 @@ packages:
     dev: true
     optional: true
 
-  /@eslint/eslintrc/1.4.0:
-    resolution: {integrity: sha512-7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A==}
+  /@eslint/eslintrc/1.4.1:
+    resolution: {integrity: sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       ajv: 6.12.6
@@ -2807,7 +2888,7 @@ packages:
     resolution: {integrity: sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==}
     engines: {node: '>= 10.14.2'}
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@jest/types': 26.6.2
       babel-plugin-istanbul: 6.1.1
       chalk: 4.1.2
@@ -2830,7 +2911,7 @@ packages:
     resolution: {integrity: sha512-8wmCFBTVGYqFNLWfcOWoVuMuKYPUBTnTMDkdvFtAYELwDOl9RGwOsvQWGPFxDJ8AWY9xM/8xCXdqmPK3+Q5Lug==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@jest/types': 29.3.1
       '@jridgewell/trace-mapping': 0.3.15
       babel-plugin-istanbul: 6.1.1
@@ -2917,12 +2998,12 @@ packages:
       '@jridgewell/sourcemap-codec': 1.4.14
     dev: true
 
-  /@limegrass/eslint-plugin-import-alias/1.0.6_eslint@8.30.0:
+  /@limegrass/eslint-plugin-import-alias/1.0.6_eslint@8.31.0:
     resolution: {integrity: sha512-BtPmdHbL4NmkVh2wMnOboyOCrdLOpBqwwtBIsB0/giTiALw/UTHD9TyH4vVnbDOuWPZQgE6kKloJ9G77FApt7w==}
     peerDependencies:
       eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
     dependencies:
-      eslint: 8.30.0
+      eslint: 8.31.0
       find-up: 5.0.0
       fs-extra: 10.1.0
       micromatch: 4.0.5
@@ -2954,11 +3035,11 @@ packages:
       react-is: 18.2.0
     dev: false
 
-  /@mui/core-downloads-tracker/5.11.2:
-    resolution: {integrity: sha512-ztLQELdSSuJFXezng8g5eCzy8mogtzMM8JcfG3HIGgUJ2RlAiBXI2Qe0adKmrJlF4FMat8vTaTeoiRNBZH4t1Q==}
+  /@mui/core-downloads-tracker/5.11.3:
+    resolution: {integrity: sha512-Bgb6//KtxY7IC7M5Pa5RKFX1wttc213mqpKqydnz3wn4BGDXfA5c0vf5nTu5zqsJeB4T3ysAJTRJhQ/E1GsZDQ==}
     dev: false
 
-  /@mui/icons-material/5.11.0_iq6n432hogcf75rdfmlkzd4zne:
+  /@mui/icons-material/5.11.0_oiuuhmk4wjjpe4qb2sby7usney:
     resolution: {integrity: sha512-I2LaOKqO8a0xcLGtIozC9xoXjZAto5G5gh0FYUMAlbsIHNHIjn4Xrw9rvjY20vZonyiGrZNMAlAXYkY6JvhF6A==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
@@ -2970,13 +3051,13 @@ packages:
         optional: true
     dependencies:
       '@babel/runtime': 7.20.6
-      '@mui/material': 5.11.2_lskpmcsdi7ipu6qpuapyu56ihm
+      '@mui/material': 5.11.3_lskpmcsdi7ipu6qpuapyu56ihm
       '@types/react': 18.0.26
       react: 18.2.0
     dev: false
 
-  /@mui/material/5.11.2_lskpmcsdi7ipu6qpuapyu56ihm:
-    resolution: {integrity: sha512-PeraRDsghnDLzejorfe9ps1syxlB8UrGs+UKwg9GGlndv5Tghm+9nwuibrP2TCDC14mlryF+u2WlAOYaPPMwGA==}
+  /@mui/material/5.11.3_lskpmcsdi7ipu6qpuapyu56ihm:
+    resolution: {integrity: sha512-Oz+rMFiMtxzzDLUxKyyj4mSxF9ShmsBoJ9qvglXCYqklgSrEl1R/Z4hfPZ+2pWd5CriO8U/0CFHr4DksrlTiCw==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
       '@emotion/react': ^11.5.0
@@ -2996,7 +3077,7 @@ packages:
       '@emotion/react': 11.10.5_kzbn2opkn2327fwg5yzwzya5o4
       '@emotion/styled': 11.10.5_qvatmowesywn4ye42qoh247szu
       '@mui/base': 5.0.0-alpha.112_ib3m5ricvtkl2cll7qpr2f6lvq
-      '@mui/core-downloads-tracker': 5.11.2
+      '@mui/core-downloads-tracker': 5.11.3
       '@mui/system': 5.11.2_ogriz7mfahdh34qnfautfro5yu
       '@mui/types': 7.2.3_@types+react@18.0.26
       '@mui/utils': 5.11.2_react@18.2.0
@@ -3220,7 +3301,7 @@ packages:
       '@sinonjs/commons': 1.8.3
     dev: true
 
-  /@svgr/babel-plugin-add-jsx-attribute/6.5.1_@babel+core@7.20.5:
+  /@svgr/babel-plugin-add-jsx-attribute/6.5.1_@babel+core@7.20.12:
     resolution: {integrity: sha512-9PYGcXrAxitycIjRmZB+Q0JaN07GZIWaTBIGQzfaZv+qr1n8X1XUEJ5rZ/vx6OVD9RRYlrNnXWExQXcmZeD/BQ==}
     engines: {node: '>=10'}
     peerDependencies:
@@ -3229,10 +3310,10 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
     dev: true
 
-  /@svgr/babel-plugin-remove-jsx-attribute/6.3.1_@babel+core@7.20.5:
+  /@svgr/babel-plugin-remove-jsx-attribute/6.3.1_@babel+core@7.20.12:
     resolution: {integrity: sha512-dQzyJ4prwjcFd929T43Z8vSYiTlTu8eafV40Z2gO7zy/SV5GT+ogxRJRBIKWomPBOiaVXFg3jY4S5hyEN3IBjQ==}
     engines: {node: '>=10'}
     peerDependencies:
@@ -3241,10 +3322,10 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
     dev: true
 
-  /@svgr/babel-plugin-remove-jsx-empty-expression/6.3.1_@babel+core@7.20.5:
+  /@svgr/babel-plugin-remove-jsx-empty-expression/6.3.1_@babel+core@7.20.12:
     resolution: {integrity: sha512-HBOUc1XwSU67fU26V5Sfb8MQsT0HvUyxru7d0oBJ4rA2s4HW3PhyAPC7fV/mdsSGpAvOdd8Wpvkjsr0fWPUO7A==}
     engines: {node: '>=10'}
     peerDependencies:
@@ -3253,10 +3334,10 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
     dev: true
 
-  /@svgr/babel-plugin-replace-jsx-attribute-value/6.5.1_@babel+core@7.20.5:
+  /@svgr/babel-plugin-replace-jsx-attribute-value/6.5.1_@babel+core@7.20.12:
     resolution: {integrity: sha512-8DPaVVE3fd5JKuIC29dqyMB54sA6mfgki2H2+swh+zNJoynC8pMPzOkidqHOSc6Wj032fhl8Z0TVn1GiPpAiJg==}
     engines: {node: '>=10'}
     peerDependencies:
@@ -3265,10 +3346,10 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
     dev: true
 
-  /@svgr/babel-plugin-svg-dynamic-title/6.5.1_@babel+core@7.20.5:
+  /@svgr/babel-plugin-svg-dynamic-title/6.5.1_@babel+core@7.20.12:
     resolution: {integrity: sha512-FwOEi0Il72iAzlkaHrlemVurgSQRDFbk0OC8dSvD5fSBPHltNh7JtLsxmZUhjYBZo2PpcU/RJvvi6Q0l7O7ogw==}
     engines: {node: '>=10'}
     peerDependencies:
@@ -3277,10 +3358,10 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
     dev: true
 
-  /@svgr/babel-plugin-svg-em-dimensions/6.5.1_@babel+core@7.20.5:
+  /@svgr/babel-plugin-svg-em-dimensions/6.5.1_@babel+core@7.20.12:
     resolution: {integrity: sha512-gWGsiwjb4tw+ITOJ86ndY/DZZ6cuXMNE/SjcDRg+HLuCmwpcjOktwRF9WgAiycTqJD/QXqL2f8IzE2Rzh7aVXA==}
     engines: {node: '>=10'}
     peerDependencies:
@@ -3289,10 +3370,10 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
     dev: true
 
-  /@svgr/babel-plugin-transform-react-native-svg/6.5.1_@babel+core@7.20.5:
+  /@svgr/babel-plugin-transform-react-native-svg/6.5.1_@babel+core@7.20.12:
     resolution: {integrity: sha512-2jT3nTayyYP7kI6aGutkyfJ7UMGtuguD72OjeGLwVNyfPRBD8zQthlvL+fAbAKk5n9ZNcvFkp/b1lZ7VsYqVJg==}
     engines: {node: '>=10'}
     peerDependencies:
@@ -3301,10 +3382,10 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
     dev: true
 
-  /@svgr/babel-plugin-transform-svg-component/6.5.1_@babel+core@7.20.5:
+  /@svgr/babel-plugin-transform-svg-component/6.5.1_@babel+core@7.20.12:
     resolution: {integrity: sha512-a1p6LF5Jt33O3rZoVRBqdxL350oge54iZWHNI6LJB5tQ7EelvD/Mb1mfBiZNAan0dt4i3VArkFRjA4iObuNykQ==}
     engines: {node: '>=12'}
     peerDependencies:
@@ -3313,10 +3394,10 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
     dev: true
 
-  /@svgr/babel-preset/6.5.1_@babel+core@7.20.5:
+  /@svgr/babel-preset/6.5.1_@babel+core@7.20.12:
     resolution: {integrity: sha512-6127fvO/FF2oi5EzSQOAjo1LE3OtNVh11R+/8FXa+mHx1ptAaS4cknIjnUA7e6j6fwGGJ17NzaTJFUwOV2zwCw==}
     engines: {node: '>=10'}
     peerDependencies:
@@ -3325,23 +3406,23 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
-      '@svgr/babel-plugin-add-jsx-attribute': 6.5.1_@babel+core@7.20.5
-      '@svgr/babel-plugin-remove-jsx-attribute': 6.3.1_@babel+core@7.20.5
-      '@svgr/babel-plugin-remove-jsx-empty-expression': 6.3.1_@babel+core@7.20.5
-      '@svgr/babel-plugin-replace-jsx-attribute-value': 6.5.1_@babel+core@7.20.5
-      '@svgr/babel-plugin-svg-dynamic-title': 6.5.1_@babel+core@7.20.5
-      '@svgr/babel-plugin-svg-em-dimensions': 6.5.1_@babel+core@7.20.5
-      '@svgr/babel-plugin-transform-react-native-svg': 6.5.1_@babel+core@7.20.5
-      '@svgr/babel-plugin-transform-svg-component': 6.5.1_@babel+core@7.20.5
+      '@babel/core': 7.20.12
+      '@svgr/babel-plugin-add-jsx-attribute': 6.5.1_@babel+core@7.20.12
+      '@svgr/babel-plugin-remove-jsx-attribute': 6.3.1_@babel+core@7.20.12
+      '@svgr/babel-plugin-remove-jsx-empty-expression': 6.3.1_@babel+core@7.20.12
+      '@svgr/babel-plugin-replace-jsx-attribute-value': 6.5.1_@babel+core@7.20.12
+      '@svgr/babel-plugin-svg-dynamic-title': 6.5.1_@babel+core@7.20.12
+      '@svgr/babel-plugin-svg-em-dimensions': 6.5.1_@babel+core@7.20.12
+      '@svgr/babel-plugin-transform-react-native-svg': 6.5.1_@babel+core@7.20.12
+      '@svgr/babel-plugin-transform-svg-component': 6.5.1_@babel+core@7.20.12
     dev: true
 
   /@svgr/core/6.5.1:
     resolution: {integrity: sha512-/xdLSWxK5QkqG524ONSjvg3V/FkNyCv538OIBdQqPNaAta3AsXj/Bd2FbvR87yMbXO2hFSWiAe/Q6IkVPDw+mw==}
     engines: {node: '>=10'}
     dependencies:
-      '@babel/core': 7.20.5
-      '@svgr/babel-preset': 6.5.1_@babel+core@7.20.5
+      '@babel/core': 7.20.12
+      '@svgr/babel-preset': 6.5.1_@babel+core@7.20.12
       '@svgr/plugin-jsx': 6.5.1_@svgr+core@6.5.1
       camelcase: 6.3.0
       cosmiconfig: 7.0.1
@@ -3353,7 +3434,7 @@ packages:
     resolution: {integrity: sha512-1hnUxxjd83EAxbL4a0JDJoD3Dao3hmjvyvyEV8PzWmLK3B9m9NPlW7GKjFyoWE8nM7HnXzPcmmSyOW8yOddSXw==}
     engines: {node: '>=10'}
     dependencies:
-      '@babel/types': 7.20.5
+      '@babel/types': 7.20.7
       entities: 4.4.0
     dev: true
 
@@ -3363,8 +3444,8 @@ packages:
     peerDependencies:
       '@svgr/core': ^6.0.0
     dependencies:
-      '@babel/core': 7.20.5
-      '@svgr/babel-preset': 6.5.1_@babel+core@7.20.5
+      '@babel/core': 7.20.12
+      '@svgr/babel-preset': 6.5.1_@babel+core@7.20.12
       '@svgr/core': 6.5.1
       '@svgr/hast-util-to-babel-ast': 6.5.1
       svg-parser: 2.0.4
@@ -3377,7 +3458,7 @@ packages:
     engines: {node: '>=12'}
     dependencies:
       '@babel/code-frame': 7.18.6
-      '@babel/runtime': 7.20.6
+      '@babel/runtime': 7.20.7
       '@types/aria-query': 4.2.2
       aria-query: 5.0.0
       chalk: 4.1.2
@@ -3443,8 +3524,8 @@ packages:
   /@types/babel__core/7.1.19:
     resolution: {integrity: sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==}
     dependencies:
-      '@babel/parser': 7.20.5
-      '@babel/types': 7.20.5
+      '@babel/parser': 7.20.7
+      '@babel/types': 7.20.7
       '@types/babel__generator': 7.6.4
       '@types/babel__template': 7.4.1
       '@types/babel__traverse': 7.17.1
@@ -3453,20 +3534,20 @@ packages:
   /@types/babel__generator/7.6.4:
     resolution: {integrity: sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==}
     dependencies:
-      '@babel/types': 7.20.5
+      '@babel/types': 7.20.7
     dev: true
 
   /@types/babel__template/7.4.1:
     resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==}
     dependencies:
-      '@babel/parser': 7.20.5
-      '@babel/types': 7.20.5
+      '@babel/parser': 7.20.7
+      '@babel/types': 7.20.7
     dev: true
 
   /@types/babel__traverse/7.17.1:
     resolution: {integrity: sha512-kVzjari1s2YVi77D3w1yuvohV2idweYXMCDzqBiVNN63TcDWrIlTVOYpqVrvbbyOE/IyzBoTKF0fdnLPEORFxA==}
     dependencies:
-      '@babel/types': 7.20.5
+      '@babel/types': 7.20.7
     dev: true
 
   /@types/eslint/8.4.5:
@@ -3502,8 +3583,8 @@ packages:
       '@types/istanbul-lib-report': 3.0.0
     dev: true
 
-  /@types/jest/29.2.4:
-    resolution: {integrity: sha512-PipFB04k2qTRPePduVLTRiPzQfvMeLwUN3Z21hsAKaB/W9IIzgB2pizCL466ftJlcyZqnHoC9ZHpxLGl3fS86A==}
+  /@types/jest/29.2.5:
+    resolution: {integrity: sha512-H2cSxkKgVmqNHXP7TC2L/WUorrZu8ZigyRywfVzv6EyBlxj39n4C00hjXYQWsbwqgElaj/CiAeSRmk5GoaKTgw==}
     dependencies:
       expect: 29.3.1
       pretty-format: 29.3.1
@@ -3529,10 +3610,6 @@ packages:
     resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==}
     dev: true
 
-  /@types/node/14.18.26:
-    resolution: {integrity: sha512-0b+utRBSYj8L7XAp0d+DX7lI4cSmowNaaTkk6/1SKzbKkG+doLuPusB9EOvzLJ8ahJSk03bTLIL6cWaEd4dBKA==}
-    dev: true
-
   /@types/node/18.11.18:
     resolution: {integrity: sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==}
     dev: true
@@ -3596,7 +3673,7 @@ packages:
   /@types/testing-library__jest-dom/5.14.5:
     resolution: {integrity: sha512-SBwbxYoyPIvxHbeHxTZX2Pe/74F/tX2/D3mMvzabdeJ25bBojfW0TyB8BHrbq/9zaaKICJZjLP+8r6AeZMFCuQ==}
     dependencies:
-      '@types/jest': 29.2.4
+      '@types/jest': 29.2.5
     dev: true
 
   /@types/tough-cookie/4.0.2:
@@ -3623,8 +3700,8 @@ packages:
     resolution: {integrity: sha512-3NoqvZC2W5gAC5DZbTpCeJ251vGQmgcWIHQJGq2J240HY6ErQ9aWKkwfoKJlHLx+A83WPNTZ9+3cd2ILxbvr1w==}
     dev: true
 
-  /@typescript-eslint/eslint-plugin/5.47.1_txmweb6yn7coi7nfrp22gpyqmy:
-    resolution: {integrity: sha512-r4RZ2Jl9kcQN7K/dcOT+J7NAimbiis4sSM9spvWimsBvDegMhKLA5vri2jG19PmIPbDjPeWzfUPQ2hjEzA4Nmg==}
+  /@typescript-eslint/eslint-plugin/5.48.0_k73wpmdolxikpyqun3p36akaaq:
+    resolution: {integrity: sha512-SVLafp0NXpoJY7ut6VFVUU9I+YeFsDzeQwtK0WZ+xbRN3mtxJ08je+6Oi2N89qDn087COdO0u3blKZNv9VetRQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       '@typescript-eslint/parser': ^5.0.0
@@ -3634,12 +3711,12 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.47.1_lzzuuodtsqwxnvqeq4g4likcqa
-      '@typescript-eslint/scope-manager': 5.47.1
-      '@typescript-eslint/type-utils': 5.47.1_lzzuuodtsqwxnvqeq4g4likcqa
-      '@typescript-eslint/utils': 5.47.1_lzzuuodtsqwxnvqeq4g4likcqa
+      '@typescript-eslint/parser': 5.48.0_iukboom6ndih5an6iafl45j2fe
+      '@typescript-eslint/scope-manager': 5.48.0
+      '@typescript-eslint/type-utils': 5.48.0_iukboom6ndih5an6iafl45j2fe
+      '@typescript-eslint/utils': 5.48.0_iukboom6ndih5an6iafl45j2fe
       debug: 4.3.4
-      eslint: 8.30.0
+      eslint: 8.31.0
       ignore: 5.2.0
       natural-compare-lite: 1.4.0
       regexpp: 3.2.0
@@ -3650,21 +3727,21 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/experimental-utils/5.30.6_lzzuuodtsqwxnvqeq4g4likcqa:
+  /@typescript-eslint/experimental-utils/5.30.6_iukboom6ndih5an6iafl45j2fe:
     resolution: {integrity: sha512-bqvT+0L8IjtW7MCrMgm9oVNxs4g7mESro1mm5c1/SNfTnHuFTf9OUX1WzVkTz75M9cp//UrTrSmGvK48NEKshQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      '@typescript-eslint/utils': 5.30.6_lzzuuodtsqwxnvqeq4g4likcqa
-      eslint: 8.30.0
+      '@typescript-eslint/utils': 5.30.6_iukboom6ndih5an6iafl45j2fe
+      eslint: 8.31.0
     transitivePeerDependencies:
       - supports-color
       - typescript
     dev: true
 
-  /@typescript-eslint/parser/5.47.1_lzzuuodtsqwxnvqeq4g4likcqa:
-    resolution: {integrity: sha512-9Vb+KIv29r6GPu4EboWOnQM7T+UjpjXvjCPhNORlgm40a9Ia9bvaPJswvtae1gip2QEeVeGh6YquqAzEgoRAlw==}
+  /@typescript-eslint/parser/5.48.0_iukboom6ndih5an6iafl45j2fe:
+    resolution: {integrity: sha512-1mxNA8qfgxX8kBvRDIHEzrRGrKHQfQlbW6iHyfHYS0Q4X1af+S6mkLNtgCOsGVl8+/LUPrqdHMssAemkrQ01qg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -3673,11 +3750,11 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/scope-manager': 5.47.1
-      '@typescript-eslint/types': 5.47.1
-      '@typescript-eslint/typescript-estree': 5.47.1_typescript@4.9.4
+      '@typescript-eslint/scope-manager': 5.48.0
+      '@typescript-eslint/types': 5.48.0
+      '@typescript-eslint/typescript-estree': 5.48.0_typescript@4.9.4
       debug: 4.3.4
-      eslint: 8.30.0
+      eslint: 8.31.0
       typescript: 4.9.4
     transitivePeerDependencies:
       - supports-color
@@ -3691,16 +3768,16 @@ packages:
       '@typescript-eslint/visitor-keys': 5.30.6
     dev: true
 
-  /@typescript-eslint/scope-manager/5.47.1:
-    resolution: {integrity: sha512-9hsFDsgUwrdOoW1D97Ewog7DYSHaq4WKuNs0LHF9RiCmqB0Z+XRR4Pf7u7u9z/8CciHuJ6yxNws1XznI3ddjEw==}
+  /@typescript-eslint/scope-manager/5.48.0:
+    resolution: {integrity: sha512-0AA4LviDtVtZqlyUQnZMVHydDATpD9SAX/RC5qh6cBd3xmyWvmXYF+WT1oOmxkeMnWDlUVTwdODeucUnjz3gow==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      '@typescript-eslint/types': 5.47.1
-      '@typescript-eslint/visitor-keys': 5.47.1
+      '@typescript-eslint/types': 5.48.0
+      '@typescript-eslint/visitor-keys': 5.48.0
     dev: true
 
-  /@typescript-eslint/type-utils/5.47.1_lzzuuodtsqwxnvqeq4g4likcqa:
-    resolution: {integrity: sha512-/UKOeo8ee80A7/GJA427oIrBi/Gd4osk/3auBUg4Rn9EahFpevVV1mUK8hjyQD5lHPqX397x6CwOk5WGh1E/1w==}
+  /@typescript-eslint/type-utils/5.48.0_iukboom6ndih5an6iafl45j2fe:
+    resolution: {integrity: sha512-vbtPO5sJyFjtHkGlGK4Sthmta0Bbls4Onv0bEqOGm7hP9h8UpRsHJwsrCiWtCUndTRNQO/qe6Ijz9rnT/DB+7g==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: '*'
@@ -3709,10 +3786,10 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/typescript-estree': 5.47.1_typescript@4.9.4
-      '@typescript-eslint/utils': 5.47.1_lzzuuodtsqwxnvqeq4g4likcqa
+      '@typescript-eslint/typescript-estree': 5.48.0_typescript@4.9.4
+      '@typescript-eslint/utils': 5.48.0_iukboom6ndih5an6iafl45j2fe
       debug: 4.3.4
-      eslint: 8.30.0
+      eslint: 8.31.0
       tsutils: 3.21.0_typescript@4.9.4
       typescript: 4.9.4
     transitivePeerDependencies:
@@ -3724,8 +3801,8 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /@typescript-eslint/types/5.47.1:
-    resolution: {integrity: sha512-CmALY9YWXEpwuu6377ybJBZdtSAnzXLSQcxLSqSQSbC7VfpMu/HLVdrnVJj7ycI138EHqocW02LPJErE35cE9A==}
+  /@typescript-eslint/types/5.48.0:
+    resolution: {integrity: sha512-UTe67B0Ypius0fnEE518NB2N8gGutIlTojeTg4nt0GQvikReVkurqxd2LvYa9q9M5MQ6rtpNyWTBxdscw40Xhw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
@@ -3743,15 +3820,15 @@ packages:
       debug: 4.3.4
       globby: 11.1.0
       is-glob: 4.0.3
-      semver: 7.3.7
+      semver: 7.3.8
       tsutils: 3.21.0_typescript@4.9.4
       typescript: 4.9.4
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/typescript-estree/5.47.1_typescript@4.9.4:
-    resolution: {integrity: sha512-4+ZhFSuISAvRi2xUszEj0xXbNTHceV9GbH9S8oAD2a/F9SW57aJNQVOCxG8GPfSWH/X4eOPdMEU2jYVuWKEpWA==}
+  /@typescript-eslint/typescript-estree/5.48.0_typescript@4.9.4:
+    resolution: {integrity: sha512-7pjd94vvIjI1zTz6aq/5wwE/YrfIyEPLtGJmRfyNR9NYIW+rOvzzUv3Cmq2hRKpvt6e9vpvPUQ7puzX7VSmsEw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       typescript: '*'
@@ -3759,8 +3836,8 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/types': 5.47.1
-      '@typescript-eslint/visitor-keys': 5.47.1
+      '@typescript-eslint/types': 5.48.0
+      '@typescript-eslint/visitor-keys': 5.48.0
       debug: 4.3.4
       globby: 11.1.0
       is-glob: 4.0.3
@@ -3771,7 +3848,7 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/utils/5.30.6_lzzuuodtsqwxnvqeq4g4likcqa:
+  /@typescript-eslint/utils/5.30.6_iukboom6ndih5an6iafl45j2fe:
     resolution: {integrity: sha512-xFBLc/esUbLOJLk9jKv0E9gD/OH966M40aY9jJ8GiqpSkP2xOV908cokJqqhVd85WoIvHVHYXxSFE4cCSDzVvA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -3781,29 +3858,29 @@ packages:
       '@typescript-eslint/scope-manager': 5.30.6
       '@typescript-eslint/types': 5.30.6
       '@typescript-eslint/typescript-estree': 5.30.6_typescript@4.9.4
-      eslint: 8.30.0
+      eslint: 8.31.0
       eslint-scope: 5.1.1
-      eslint-utils: 3.0.0_eslint@8.30.0
+      eslint-utils: 3.0.0_eslint@8.31.0
     transitivePeerDependencies:
       - supports-color
       - typescript
     dev: true
 
-  /@typescript-eslint/utils/5.47.1_lzzuuodtsqwxnvqeq4g4likcqa:
-    resolution: {integrity: sha512-l90SdwqfmkuIVaREZ2ykEfCezepCLxzWMo5gVfcJsJCaT4jHT+QjgSkYhs5BMQmWqE9k3AtIfk4g211z/sTMVw==}
+  /@typescript-eslint/utils/5.48.0_iukboom6ndih5an6iafl45j2fe:
+    resolution: {integrity: sha512-x2jrMcPaMfsHRRIkL+x96++xdzvrdBCnYRd5QiW5Wgo1OB4kDYPbC1XjWP/TNqlfK93K/lUL92erq5zPLgFScQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
       '@types/json-schema': 7.0.11
       '@types/semver': 7.3.12
-      '@typescript-eslint/scope-manager': 5.47.1
-      '@typescript-eslint/types': 5.47.1
-      '@typescript-eslint/typescript-estree': 5.47.1_typescript@4.9.4
-      eslint: 8.30.0
+      '@typescript-eslint/scope-manager': 5.48.0
+      '@typescript-eslint/types': 5.48.0
+      '@typescript-eslint/typescript-estree': 5.48.0_typescript@4.9.4
+      eslint: 8.31.0
       eslint-scope: 5.1.1
-      eslint-utils: 3.0.0_eslint@8.30.0
-      semver: 7.3.7
+      eslint-utils: 3.0.0_eslint@8.31.0
+      semver: 7.3.8
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -3817,26 +3894,26 @@ packages:
       eslint-visitor-keys: 3.3.0
     dev: true
 
-  /@typescript-eslint/visitor-keys/5.47.1:
-    resolution: {integrity: sha512-rF3pmut2JCCjh6BLRhNKdYjULMb1brvoaiWDlHfLNVgmnZ0sBVJrs3SyaKE1XoDDnJuAx/hDQryHYmPUuNq0ig==}
+  /@typescript-eslint/visitor-keys/5.48.0:
+    resolution: {integrity: sha512-5motVPz5EgxQ0bHjut3chzBkJ3Z3sheYVcSwS5BpHZpLqSptSmELNtGixmgj65+rIfhvtQTz5i9OP2vtzdDH7Q==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      '@typescript-eslint/types': 5.47.1
+      '@typescript-eslint/types': 5.48.0
       eslint-visitor-keys: 3.3.0
     dev: true
 
-  /@vitejs/plugin-react/3.0.0_vite@4.0.3:
-    resolution: {integrity: sha512-1mvyPc0xYW5G8CHQvJIJXLoMjl5Ct3q2g5Y2s6Ccfgwm45y48LBvsla7az+GkkAtYikWQ4Lxqcsq5RHLcZgtNQ==}
+  /@vitejs/plugin-react/3.0.1_vite@4.0.4:
+    resolution: {integrity: sha512-mx+QvYwIbbpOIJw+hypjnW1lAbKDHtWK5ibkF/V1/oMBu8HU/chb+SnqJDAsLq1+7rGqjktCEomMTM5KShzUKQ==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
       vite: ^4.0.0
     dependencies:
-      '@babel/core': 7.20.5
-      '@babel/plugin-transform-react-jsx-self': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-react-jsx-source': 7.19.6_@babel+core@7.20.5
+      '@babel/core': 7.20.12
+      '@babel/plugin-transform-react-jsx-self': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-react-jsx-source': 7.19.6_@babel+core@7.20.12
       magic-string: 0.27.0
       react-refresh: 0.14.0
-      vite: 4.0.3_@types+node@18.11.18
+      vite: 4.0.4_@types+node@18.11.18
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -4112,8 +4189,8 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
-  /axios/1.2.1:
-    resolution: {integrity: sha512-I88cFiGu9ryt/tfVEi4kX2SITsvDddTajXTOFmt2uK1ZVA8LytjtdeyefdQWEf5PU8w+4SSJDoYnggflB5tW4A==}
+  /axios/1.2.2:
+    resolution: {integrity: sha512-bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q==}
     dependencies:
       follow-redirects: 1.15.1
       form-data: 4.0.0
@@ -4148,7 +4225,7 @@ packages:
       - supports-color
     dev: true
 
-  /babel-jest/29.3.1_@babel+core@7.20.5:
+  /babel-jest/29.3.1_@babel+core@7.20.12:
     resolution: {integrity: sha512-aard+xnMoxgjwV70t0L6wkW/3HQQtV+O0PEimxKgzNqCJnbYmroPojdP2tqKSOAt8QAKV/uSZU8851M7B5+fcA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
@@ -4157,11 +4234,11 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@jest/transform': 29.3.1
       '@types/babel__core': 7.1.19
       babel-plugin-istanbul: 6.1.1
-      babel-preset-jest: 29.2.0_@babel+core@7.20.5
+      babel-preset-jest: 29.2.0_@babel+core@7.20.12
       chalk: 4.1.2
       graceful-fs: 4.2.10
       slash: 3.0.0
@@ -4192,8 +4269,8 @@ packages:
     resolution: {integrity: sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==}
     engines: {node: '>= 10.14.2'}
     dependencies:
-      '@babel/template': 7.18.10
-      '@babel/types': 7.20.5
+      '@babel/template': 7.20.7
+      '@babel/types': 7.20.7
       '@types/babel__core': 7.1.19
       '@types/babel__traverse': 7.17.1
     dev: true
@@ -4202,8 +4279,8 @@ packages:
     resolution: {integrity: sha512-TnspP2WNiR3GLfCsUNHqeXw0RoQ2f9U5hQ5L3XFpwuO8htQmSrhh8qsB6vi5Yi8+kuynN1yjDjQsPfkebmB6ZA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@babel/template': 7.18.10
-      '@babel/types': 7.20.5
+      '@babel/template': 7.20.7
+      '@babel/types': 7.20.7
       '@types/babel__core': 7.1.19
       '@types/babel__traverse': 7.17.1
     dev: true
@@ -4212,11 +4289,11 @@ packages:
     resolution: {integrity: sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==}
     engines: {node: '>=10', npm: '>=6'}
     dependencies:
-      '@babel/runtime': 7.20.6
+      '@babel/runtime': 7.20.7
       cosmiconfig: 7.0.1
       resolve: 1.22.1
 
-  /babel-plugin-polyfill-corejs2/0.3.1_@babel+core@7.20.5:
+  /babel-plugin-polyfill-corejs2/0.3.1_@babel+core@7.20.12:
     resolution: {integrity: sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -4225,14 +4302,14 @@ packages:
         optional: true
     dependencies:
       '@babel/compat-data': 7.20.5
-      '@babel/core': 7.20.5
-      '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.20.5
+      '@babel/core': 7.20.12
+      '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.20.12
       semver: 6.3.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /babel-plugin-polyfill-corejs3/0.5.2_@babel+core@7.20.5:
+  /babel-plugin-polyfill-corejs3/0.5.2_@babel+core@7.20.12:
     resolution: {integrity: sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -4240,14 +4317,14 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
-      '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.20.5
+      '@babel/core': 7.20.12
+      '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.20.12
       core-js-compat: 3.23.4
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /babel-plugin-polyfill-regenerator/0.3.1_@babel+core@7.20.5:
+  /babel-plugin-polyfill-regenerator/0.3.1_@babel+core@7.20.12:
     resolution: {integrity: sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -4255,8 +4332,8 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
-      '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.20.5
+      '@babel/core': 7.20.12
+      '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.20.12
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -4288,7 +4365,7 @@ packages:
       '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.18.6
     dev: true
 
-  /babel-preset-current-node-syntax/1.0.1_@babel+core@7.20.5:
+  /babel-preset-current-node-syntax/1.0.1_@babel+core@7.20.12:
     resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==}
     peerDependencies:
       '@babel/core': ^7.0.0
@@ -4296,19 +4373,19 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
-      '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.20.5
-      '@babel/plugin-syntax-bigint': 7.8.3_@babel+core@7.20.5
-      '@babel/plugin-syntax-class-properties': 7.12.13_@babel+core@7.20.5
-      '@babel/plugin-syntax-import-meta': 7.10.4_@babel+core@7.20.5
-      '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.20.5
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.20.5
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.20.5
-      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.20.5
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.20.5
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.20.5
-      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.20.5
-      '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.20.5
+      '@babel/core': 7.20.12
+      '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.20.12
+      '@babel/plugin-syntax-bigint': 7.8.3_@babel+core@7.20.12
+      '@babel/plugin-syntax-class-properties': 7.12.13_@babel+core@7.20.12
+      '@babel/plugin-syntax-import-meta': 7.10.4_@babel+core@7.20.12
+      '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.20.12
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.20.12
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.20.12
+      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.20.12
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.20.12
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.20.12
+      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.20.12
+      '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.20.12
     dev: true
 
   /babel-preset-jest/26.6.2_@babel+core@7.18.6:
@@ -4325,7 +4402,7 @@ packages:
       babel-preset-current-node-syntax: 1.0.1_@babel+core@7.18.6
     dev: true
 
-  /babel-preset-jest/29.2.0_@babel+core@7.20.5:
+  /babel-preset-jest/29.2.0_@babel+core@7.20.12:
     resolution: {integrity: sha512-z9JmMJppMxNv8N7fNRHvhMg9cvIkMxQBXgFkane3yKVEvEOP+kB50lk8DFRvF9PGqbyXxlmebKWhuDORO8RgdA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
@@ -4334,28 +4411,28 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       babel-plugin-jest-hoist: 29.2.0
-      babel-preset-current-node-syntax: 1.0.1_@babel+core@7.20.5
+      babel-preset-current-node-syntax: 1.0.1_@babel+core@7.20.12
     dev: true
 
   /babel-preset-react-app/10.0.1:
     resolution: {integrity: sha512-b0D9IZ1WhhCWkrTXyFuIIgqGzSkRIH5D5AmB0bXbzYAB1OBAwHcUeyWW2LorutLWF5btNo/N7r/cIdmvvKJlYg==}
     dependencies:
-      '@babel/core': 7.20.5
-      '@babel/plugin-proposal-class-properties': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-proposal-decorators': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-proposal-numeric-separator': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-proposal-optional-chaining': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-proposal-private-methods': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-proposal-private-property-in-object': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-flow-strip-types': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-react-display-name': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-transform-runtime': 7.18.6_@babel+core@7.20.5
-      '@babel/preset-env': 7.18.6_@babel+core@7.20.5
-      '@babel/preset-react': 7.18.6_@babel+core@7.20.5
-      '@babel/preset-typescript': 7.18.6_@babel+core@7.20.5
+      '@babel/core': 7.20.12
+      '@babel/plugin-proposal-class-properties': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-proposal-decorators': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-proposal-numeric-separator': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-proposal-optional-chaining': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-proposal-private-methods': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-proposal-private-property-in-object': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-flow-strip-types': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-react-display-name': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-transform-runtime': 7.18.6_@babel+core@7.20.12
+      '@babel/preset-env': 7.18.6_@babel+core@7.20.12
+      '@babel/preset-react': 7.18.6_@babel+core@7.20.12
+      '@babel/preset-typescript': 7.18.6_@babel+core@7.20.12
       '@babel/runtime': 7.20.7
       babel-plugin-macros: 3.1.0
       babel-plugin-transform-react-remove-prop-types: 0.4.24
@@ -4410,14 +4487,14 @@ packages:
       fill-range: 7.0.1
     dev: true
 
-  /broadcast-channel/4.18.1:
-    resolution: {integrity: sha512-eV1srWgt6H4hbtGqD7THn60me66WA5l0LogpssuX9jK6NK26HzIZr+VsrlD7Obe0BtYnwoo/a4v4z5gfty04DA==}
+  /broadcast-channel/4.20.1:
+    resolution: {integrity: sha512-ob5xyUEMWJRBOggwVGEZpKCXK/Pkfe3LkrokNTwgywhKXFNETRkD5IanLqmpY/roy7bqBsijb7lMEDyc1qlnHQ==}
     dependencies:
-      '@babel/runtime': 7.19.4
+      '@babel/runtime': 7.20.7
       oblivious-set: 1.1.1
       p-queue: 6.6.2
       rimraf: 3.0.2
-      unload: 2.3.1
+      unload: 2.4.1
     dev: false
 
   /browser-process-hrtime/1.0.0:
@@ -4690,7 +4767,7 @@ packages:
     requiresBuild: true
     dev: true
 
-  /cosmiconfig-typescript-loader/4.0.0_64g3pvarf3oduwh7nnbyl3yqm4:
+  /cosmiconfig-typescript-loader/4.0.0_ubnk2r5xvemv3ydnuibh5f2mpu:
     resolution: {integrity: sha512-cVpucSc2Tf+VPwCCR7SZzmQTQkPbkk4O01yXsYqXBIbjE1bhwqSyAgYQkRK1un4i0OPziTleqFhdkmOc4RQ/9g==}
     engines: {node: '>=12', npm: '>=6'}
     peerDependencies:
@@ -4699,9 +4776,9 @@ packages:
       ts-node: '>=10'
       typescript: '>=3'
     dependencies:
-      '@types/node': 14.18.26
-      cosmiconfig: 7.0.1
-      ts-node: 10.9.0_hylbnkdpdgf7fwrtnxxops6eba
+      '@types/node': 18.11.18
+      cosmiconfig: 8.0.0
+      ts-node: 10.9.0_awa2wsr5thmg3i7jqycphctjfq
       typescript: 4.9.4
     dev: true
 
@@ -4715,6 +4792,16 @@ packages:
       path-type: 4.0.0
       yaml: 1.10.2
 
+  /cosmiconfig/8.0.0:
+    resolution: {integrity: sha512-da1EafcpH6b/TD8vDRaWV7xFINlHlF6zKsGwS1TsuVJTZRkquaS5HTMq7uq6h31619QjbsYl21gVDOm32KM1vQ==}
+    engines: {node: '>=14'}
+    dependencies:
+      import-fresh: 3.3.0
+      js-yaml: 4.1.0
+      parse-json: 5.2.0
+      path-type: 4.0.0
+    dev: true
+
   /create-require/1.1.1:
     resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
     dev: true
@@ -4848,6 +4935,7 @@ packages:
   /decode-uri-component/0.2.2:
     resolution: {integrity: sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==}
     engines: {node: '>=0.10'}
+    dev: true
 
   /dedent/0.7.0:
     resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==}
@@ -4906,10 +4994,6 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /detect-node/2.1.0:
-    resolution: {integrity: sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==}
-    dev: false
-
   /diff-sequences/29.3.1:
     resolution: {integrity: sha512-hlM3QR272NXCi4pq+N4Kok4kOp6EsgOM3ZSpJI7Da3UAs+Ttsi8MRmB6trM/lhyzUxGfOgnpkHtgqm5Q/CTcfQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -5052,7 +5136,7 @@ packages:
       is-symbol: 1.0.4
     dev: true
 
-  /esbuild-jest/0.5.0_esbuild@0.16.10:
+  /esbuild-jest/0.5.0_esbuild@0.16.14:
     resolution: {integrity: sha512-AMZZCdEpXfNVOIDvURlqYyHwC8qC1/BFjgsrOiSL1eyiIArVtHL8YAC83Shhn16cYYoAWEW17yZn0W/RJKJKHQ==}
     peerDependencies:
       esbuild: '>=0.8.50'
@@ -5060,39 +5144,39 @@ packages:
       '@babel/core': 7.18.6
       '@babel/plugin-transform-modules-commonjs': 7.18.6_@babel+core@7.18.6
       babel-jest: 26.6.3_@babel+core@7.18.6
-      esbuild: 0.16.10
+      esbuild: 0.16.14
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /esbuild/0.16.10:
-    resolution: {integrity: sha512-z5dIViHoVnw2l+NCJ3zj5behdXjYvXne9gL18OOivCadXDUhyDkeSvEtLcGVAJW2fNmh33TDUpsi704XYlDodw==}
+  /esbuild/0.16.14:
+    resolution: {integrity: sha512-6xAn3O6ZZyoxZAEkwfI9hw4cEqSr/o1ViJtnkvImVkblmUN65Md04o0S/7H1WNu1XGf1Cjij/on7VO4psIYjkw==}
     engines: {node: '>=12'}
     hasBin: true
     requiresBuild: true
     optionalDependencies:
-      '@esbuild/android-arm': 0.16.10
-      '@esbuild/android-arm64': 0.16.10
-      '@esbuild/android-x64': 0.16.10
-      '@esbuild/darwin-arm64': 0.16.10
-      '@esbuild/darwin-x64': 0.16.10
-      '@esbuild/freebsd-arm64': 0.16.10
-      '@esbuild/freebsd-x64': 0.16.10
-      '@esbuild/linux-arm': 0.16.10
-      '@esbuild/linux-arm64': 0.16.10
-      '@esbuild/linux-ia32': 0.16.10
-      '@esbuild/linux-loong64': 0.16.10
-      '@esbuild/linux-mips64el': 0.16.10
-      '@esbuild/linux-ppc64': 0.16.10
-      '@esbuild/linux-riscv64': 0.16.10
-      '@esbuild/linux-s390x': 0.16.10
-      '@esbuild/linux-x64': 0.16.10
-      '@esbuild/netbsd-x64': 0.16.10
-      '@esbuild/openbsd-x64': 0.16.10
-      '@esbuild/sunos-x64': 0.16.10
-      '@esbuild/win32-arm64': 0.16.10
-      '@esbuild/win32-ia32': 0.16.10
-      '@esbuild/win32-x64': 0.16.10
+      '@esbuild/android-arm': 0.16.14
+      '@esbuild/android-arm64': 0.16.14
+      '@esbuild/android-x64': 0.16.14
+      '@esbuild/darwin-arm64': 0.16.14
+      '@esbuild/darwin-x64': 0.16.14
+      '@esbuild/freebsd-arm64': 0.16.14
+      '@esbuild/freebsd-x64': 0.16.14
+      '@esbuild/linux-arm': 0.16.14
+      '@esbuild/linux-arm64': 0.16.14
+      '@esbuild/linux-ia32': 0.16.14
+      '@esbuild/linux-loong64': 0.16.14
+      '@esbuild/linux-mips64el': 0.16.14
+      '@esbuild/linux-ppc64': 0.16.14
+      '@esbuild/linux-riscv64': 0.16.14
+      '@esbuild/linux-s390x': 0.16.14
+      '@esbuild/linux-x64': 0.16.14
+      '@esbuild/netbsd-x64': 0.16.14
+      '@esbuild/openbsd-x64': 0.16.14
+      '@esbuild/sunos-x64': 0.16.14
+      '@esbuild/win32-arm64': 0.16.14
+      '@esbuild/win32-ia32': 0.16.14
+      '@esbuild/win32-x64': 0.16.14
     dev: true
 
   /escalade/3.1.1:
@@ -5126,16 +5210,16 @@ packages:
       source-map: 0.6.1
     dev: true
 
-  /eslint-config-prettier/8.5.0_eslint@8.30.0:
-    resolution: {integrity: sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==}
+  /eslint-config-prettier/8.6.0_eslint@8.31.0:
+    resolution: {integrity: sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA==}
     hasBin: true
     peerDependencies:
       eslint: '>=7.0.0'
     dependencies:
-      eslint: 8.30.0
+      eslint: 8.31.0
     dev: true
 
-  /eslint-config-react-app/7.0.1_5dzg3kvqggpfcaryo776p5cisq:
+  /eslint-config-react-app/7.0.1_hcgtzugqufufn3fem7cpkdlcvu:
     resolution: {integrity: sha512-K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -5146,20 +5230,20 @@ packages:
         optional: true
     dependencies:
       '@babel/core': 7.18.6
-      '@babel/eslint-parser': 7.18.2_krbl7gjo3afxleq6arh2klsyza
+      '@babel/eslint-parser': 7.18.2_73v55hpqq5rouuatnxlsrke4km
       '@rushstack/eslint-patch': 1.1.4
-      '@typescript-eslint/eslint-plugin': 5.47.1_txmweb6yn7coi7nfrp22gpyqmy
-      '@typescript-eslint/parser': 5.47.1_lzzuuodtsqwxnvqeq4g4likcqa
+      '@typescript-eslint/eslint-plugin': 5.48.0_k73wpmdolxikpyqun3p36akaaq
+      '@typescript-eslint/parser': 5.48.0_iukboom6ndih5an6iafl45j2fe
       babel-preset-react-app: 10.0.1
       confusing-browser-globals: 1.0.11
-      eslint: 8.30.0
-      eslint-plugin-flowtype: 8.0.3_eslint@8.30.0
-      eslint-plugin-import: 2.26.0_wspzxxdxgd6sryq2cmxnia3diy
-      eslint-plugin-jest: 25.7.0_q2j57hara4akamrxhqbo5gmcq4
-      eslint-plugin-jsx-a11y: 6.6.1_eslint@8.30.0
-      eslint-plugin-react: 7.31.11_eslint@8.30.0
-      eslint-plugin-react-hooks: 4.6.0_eslint@8.30.0
-      eslint-plugin-testing-library: 5.5.1_lzzuuodtsqwxnvqeq4g4likcqa
+      eslint: 8.31.0
+      eslint-plugin-flowtype: 8.0.3_eslint@8.31.0
+      eslint-plugin-import: 2.26.0_cxu27kyieece4tnvunezm4whiq
+      eslint-plugin-jest: 25.7.0_5lw7u3puxf47qfi53ot2fqzcvq
+      eslint-plugin-jsx-a11y: 6.6.1_eslint@8.31.0
+      eslint-plugin-react: 7.31.11_eslint@8.31.0
+      eslint-plugin-react-hooks: 4.6.0_eslint@8.31.0
+      eslint-plugin-testing-library: 5.5.1_iukboom6ndih5an6iafl45j2fe
       typescript: 4.9.4
     transitivePeerDependencies:
       - '@babel/plugin-syntax-flow'
@@ -5183,7 +5267,7 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-import-resolver-typescript/3.5.2_2lbwmhbr7bncddqbzzpg77o75m:
+  /eslint-import-resolver-typescript/3.5.2_ol7jqilc3wemtdbq3nzhywgxq4:
     resolution: {integrity: sha512-zX4ebnnyXiykjhcBvKIf5TNvt8K7yX6bllTRZ14MiurKPjDpCAZujlszTdB8pcNXhZcOf+god4s9SjQa5GnytQ==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
@@ -5192,8 +5276,8 @@ packages:
     dependencies:
       debug: 4.3.4
       enhanced-resolve: 5.10.0
-      eslint: 8.30.0
-      eslint-plugin-import: 2.26.0_wspzxxdxgd6sryq2cmxnia3diy
+      eslint: 8.31.0
+      eslint-plugin-import: 2.26.0_cxu27kyieece4tnvunezm4whiq
       get-tsconfig: 4.2.0
       globby: 13.1.2
       is-core-module: 2.10.0
@@ -5203,7 +5287,7 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-module-utils/2.7.3_xwkgymqrkgeqobyqeskk5o3z2u:
+  /eslint-module-utils/2.7.3_6prlq55rvc2dhczwxah27e4oua:
     resolution: {integrity: sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -5221,16 +5305,16 @@ packages:
       eslint-import-resolver-webpack:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.47.1_lzzuuodtsqwxnvqeq4g4likcqa
+      '@typescript-eslint/parser': 5.48.0_iukboom6ndih5an6iafl45j2fe
       debug: 3.2.7
       eslint-import-resolver-node: 0.3.6
-      eslint-import-resolver-typescript: 3.5.2_2lbwmhbr7bncddqbzzpg77o75m
+      eslint-import-resolver-typescript: 3.5.2_ol7jqilc3wemtdbq3nzhywgxq4
       find-up: 2.1.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /eslint-plugin-flowtype/8.0.3_eslint@8.30.0:
+  /eslint-plugin-flowtype/8.0.3_eslint@8.31.0:
     resolution: {integrity: sha512-dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
@@ -5243,12 +5327,12 @@ packages:
       '@babel/plugin-transform-react-jsx':
         optional: true
     dependencies:
-      eslint: 8.30.0
+      eslint: 8.31.0
       lodash: 4.17.21
       string-natural-compare: 3.0.1
     dev: true
 
-  /eslint-plugin-import/2.26.0_wspzxxdxgd6sryq2cmxnia3diy:
+  /eslint-plugin-import/2.26.0_cxu27kyieece4tnvunezm4whiq:
     resolution: {integrity: sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -5258,14 +5342,14 @@ packages:
       '@typescript-eslint/parser':
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.47.1_lzzuuodtsqwxnvqeq4g4likcqa
+      '@typescript-eslint/parser': 5.48.0_iukboom6ndih5an6iafl45j2fe
       array-includes: 3.1.5
       array.prototype.flat: 1.3.0
       debug: 2.6.9
       doctrine: 2.1.0
-      eslint: 8.30.0
+      eslint: 8.31.0
       eslint-import-resolver-node: 0.3.6
-      eslint-module-utils: 2.7.3_xwkgymqrkgeqobyqeskk5o3z2u
+      eslint-module-utils: 2.7.3_6prlq55rvc2dhczwxah27e4oua
       has: 1.0.3
       is-core-module: 2.9.0
       is-glob: 4.0.3
@@ -5279,7 +5363,7 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-plugin-jest/25.7.0_q2j57hara4akamrxhqbo5gmcq4:
+  /eslint-plugin-jest/25.7.0_5lw7u3puxf47qfi53ot2fqzcvq:
     resolution: {integrity: sha512-PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     peerDependencies:
@@ -5292,16 +5376,16 @@ packages:
       jest:
         optional: true
     dependencies:
-      '@typescript-eslint/eslint-plugin': 5.47.1_txmweb6yn7coi7nfrp22gpyqmy
-      '@typescript-eslint/experimental-utils': 5.30.6_lzzuuodtsqwxnvqeq4g4likcqa
-      eslint: 8.30.0
+      '@typescript-eslint/eslint-plugin': 5.48.0_k73wpmdolxikpyqun3p36akaaq
+      '@typescript-eslint/experimental-utils': 5.30.6_iukboom6ndih5an6iafl45j2fe
+      eslint: 8.31.0
       jest: 29.3.1_@types+node@18.11.18
     transitivePeerDependencies:
       - supports-color
       - typescript
     dev: true
 
-  /eslint-plugin-jsx-a11y/6.6.1_eslint@8.30.0:
+  /eslint-plugin-jsx-a11y/6.6.1_eslint@8.31.0:
     resolution: {integrity: sha512-sXgFVNHiWffBq23uiS/JaP6eVR622DqwB4yTzKvGZGcPq6/yZ3WmOZfuBks/vHWo9GaFOqC2ZK4i6+C35knx7Q==}
     engines: {node: '>=4.0'}
     peerDependencies:
@@ -5315,7 +5399,7 @@ packages:
       axobject-query: 2.2.0
       damerau-levenshtein: 1.0.8
       emoji-regex: 9.2.2
-      eslint: 8.30.0
+      eslint: 8.31.0
       has: 1.0.3
       jsx-ast-utils: 3.3.2
       language-tags: 1.0.5
@@ -5323,7 +5407,7 @@ packages:
       semver: 6.3.0
     dev: true
 
-  /eslint-plugin-prettier/4.2.1_kl4pe43v5b43npmso5hoplpbyi:
+  /eslint-plugin-prettier/4.2.1_32m5uc2milwdw3tnkcq5del26y:
     resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
@@ -5334,22 +5418,22 @@ packages:
       eslint-config-prettier:
         optional: true
     dependencies:
-      eslint: 8.30.0
-      eslint-config-prettier: 8.5.0_eslint@8.30.0
+      eslint: 8.31.0
+      eslint-config-prettier: 8.6.0_eslint@8.31.0
       prettier: 2.8.1
       prettier-linter-helpers: 1.0.0
     dev: true
 
-  /eslint-plugin-react-hooks/4.6.0_eslint@8.30.0:
+  /eslint-plugin-react-hooks/4.6.0_eslint@8.31.0:
     resolution: {integrity: sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==}
     engines: {node: '>=10'}
     peerDependencies:
       eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
     dependencies:
-      eslint: 8.30.0
+      eslint: 8.31.0
     dev: true
 
-  /eslint-plugin-react/7.31.11_eslint@8.30.0:
+  /eslint-plugin-react/7.31.11_eslint@8.31.0:
     resolution: {integrity: sha512-TTvq5JsT5v56wPa9OYHzsrOlHzKZKjV+aLgS+55NJP/cuzdiQPC7PfYoUjMoxlffKtvijpk7vA/jmuqRb9nohw==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -5359,7 +5443,7 @@ packages:
       array.prototype.flatmap: 1.3.1
       array.prototype.tosorted: 1.1.1
       doctrine: 2.1.0
-      eslint: 8.30.0
+      eslint: 8.31.0
       estraverse: 5.3.0
       jsx-ast-utils: 3.3.2
       minimatch: 3.1.2
@@ -5373,14 +5457,14 @@ packages:
       string.prototype.matchall: 4.0.8
     dev: true
 
-  /eslint-plugin-testing-library/5.5.1_lzzuuodtsqwxnvqeq4g4likcqa:
+  /eslint-plugin-testing-library/5.5.1_iukboom6ndih5an6iafl45j2fe:
     resolution: {integrity: sha512-plLEkkbAKBjPxsLj7x4jNapcHAg2ernkQlKKrN2I8NrQwPISZHyCUNvg5Hv3EDqOQReToQb5bnqXYbkijJPE/g==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0, npm: '>=6'}
     peerDependencies:
       eslint: ^7.5.0 || ^8.0.0
     dependencies:
-      '@typescript-eslint/utils': 5.47.1_lzzuuodtsqwxnvqeq4g4likcqa
-      eslint: 8.30.0
+      '@typescript-eslint/utils': 5.48.0_iukboom6ndih5an6iafl45j2fe
+      eslint: 8.31.0
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -5402,13 +5486,13 @@ packages:
       estraverse: 5.3.0
     dev: true
 
-  /eslint-utils/3.0.0_eslint@8.30.0:
+  /eslint-utils/3.0.0_eslint@8.31.0:
     resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
     engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
     peerDependencies:
       eslint: '>=5'
     dependencies:
-      eslint: 8.30.0
+      eslint: 8.31.0
       eslint-visitor-keys: 2.1.0
     dev: true
 
@@ -5422,12 +5506,12 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /eslint/8.30.0:
-    resolution: {integrity: sha512-MGADB39QqYuzEGov+F/qb18r4i7DohCDOfatHaxI2iGlPuC65bwG2gxgO+7DkyL38dRFaRH7RaRAgU6JKL9rMQ==}
+  /eslint/8.31.0:
+    resolution: {integrity: sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     hasBin: true
     dependencies:
-      '@eslint/eslintrc': 1.4.0
+      '@eslint/eslintrc': 1.4.1
       '@humanwhocodes/config-array': 0.11.8
       '@humanwhocodes/module-importer': 1.0.1
       '@nodelib/fs.walk': 1.2.8
@@ -5438,7 +5522,7 @@ packages:
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.1.1
-      eslint-utils: 3.0.0_eslint@8.30.0
+      eslint-utils: 3.0.0_eslint@8.31.0
       eslint-visitor-keys: 3.3.0
       espree: 9.4.0
       esquery: 1.4.0
@@ -5679,11 +5763,6 @@ packages:
       to-regex-range: 5.0.1
     dev: true
 
-  /filter-obj/1.1.0:
-    resolution: {integrity: sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==}
-    engines: {node: '>=0.10.0'}
-    dev: false
-
   /find-root/1.1.0:
     resolution: {integrity: sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==}
     dev: false
@@ -5762,6 +5841,15 @@ packages:
       universalify: 2.0.0
     dev: true
 
+  /fs-extra/11.1.0:
+    resolution: {integrity: sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==}
+    engines: {node: '>=14.14'}
+    dependencies:
+      graceful-fs: 4.2.10
+      jsonfile: 6.1.0
+      universalify: 2.0.0
+    dev: true
+
   /fs.realpath/1.0.0:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
 
@@ -6069,8 +6157,8 @@ packages:
     engines: {node: '>=10.17.0'}
     dev: true
 
-  /husky/8.0.2:
-    resolution: {integrity: sha512-Tkv80jtvbnkK3mYWxPZePGFpQ/tT3HNSs/sasF9P2YfkMezDl3ON37YN6jUUI4eTg5LcyVynlb6r4eyvOmspvg==}
+  /husky/8.0.3:
+    resolution: {integrity: sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==}
     engines: {node: '>=14'}
     hasBin: true
     dev: true
@@ -6093,10 +6181,10 @@ packages:
       - encoding
     dev: false
 
-  /i18next/22.4.6:
-    resolution: {integrity: sha512-9Tm1ezxWyzV+306CIDMBbYBitC1jedQyYuuLtIv7oxjp2ohh8eyxP9xytIf+2bbQfhH784IQKPSYp+Zq9+YSbw==}
+  /i18next/22.4.8:
+    resolution: {integrity: sha512-XSOy17ZWqflOiJRYE/dzv6vDle2Se32dnHREHb93UnZzZ1+UnvQ8yKtt1fpNL3zvXz5AwCqqixrtTVZmRetaiQ==}
     dependencies:
-      '@babel/runtime': 7.20.6
+      '@babel/runtime': 7.20.7
     dev: false
 
   /iconv-lite/0.6.3:
@@ -6446,7 +6534,7 @@ packages:
     resolution: {integrity: sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==}
     engines: {node: '>=8'}
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@babel/parser': 7.20.5
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-coverage: 3.2.0
@@ -6558,11 +6646,11 @@ packages:
       ts-node:
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
+      '@babel/core': 7.20.12
       '@jest/test-sequencer': 29.3.1
       '@jest/types': 29.3.1
       '@types/node': 18.11.18
-      babel-jest: 29.3.1_@babel+core@7.20.5
+      babel-jest: 29.3.1_@babel+core@7.20.12
       chalk: 4.1.2
       ci-info: 3.3.2
       deepmerge: 4.2.2
@@ -6855,18 +6943,18 @@ packages:
     resolution: {integrity: sha512-+3JOc+s28upYLI2OJM4PWRGK9AgpsMs/ekNryUV0yMBClT9B1DF2u2qay8YxcQd338PPYSFNb0lsar1B49sLDA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@babel/core': 7.20.5
-      '@babel/generator': 7.20.5
-      '@babel/plugin-syntax-jsx': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-syntax-typescript': 7.18.6_@babel+core@7.20.5
-      '@babel/traverse': 7.20.5
-      '@babel/types': 7.20.5
+      '@babel/core': 7.20.12
+      '@babel/generator': 7.20.7
+      '@babel/plugin-syntax-jsx': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-syntax-typescript': 7.18.6_@babel+core@7.20.12
+      '@babel/traverse': 7.20.12
+      '@babel/types': 7.20.7
       '@jest/expect-utils': 29.3.1
       '@jest/transform': 29.3.1
       '@jest/types': 29.3.1
       '@types/babel__traverse': 7.17.1
       '@types/prettier': 2.6.3
-      babel-preset-current-node-syntax: 1.0.1_@babel+core@7.20.5
+      babel-preset-current-node-syntax: 1.0.1_@babel+core@7.20.12
       chalk: 4.1.2
       expect: 29.3.1
       graceful-fs: 4.2.10
@@ -6878,7 +6966,7 @@ packages:
       jest-util: 29.3.1
       natural-compare: 1.4.0
       pretty-format: 29.3.1
-      semver: 7.3.7
+      semver: 7.3.8
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -7095,6 +7183,12 @@ packages:
     hasBin: true
     dev: true
 
+  /json5/2.2.3:
+    resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
+    engines: {node: '>=6'}
+    hasBin: true
+    dev: true
+
   /jsonfile/6.1.0:
     resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
     dependencies:
@@ -7317,6 +7411,12 @@ packages:
     dependencies:
       js-tokens: 4.0.0
 
+  /lru-cache/5.1.1:
+    resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
+    dependencies:
+      yallist: 3.1.1
+    dev: true
+
   /lru-cache/6.0.0:
     resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
     engines: {node: '>=10'}
@@ -7560,7 +7660,7 @@ packages:
     dependencies:
       hosted-git-info: 4.1.0
       is-core-module: 2.10.0
-      semver: 7.3.7
+      semver: 7.3.8
       validate-npm-package-license: 3.0.4
     dev: true
 
@@ -7994,16 +8094,6 @@ packages:
       react: 18.2.0
     dev: false
 
-  /query-string/7.1.3:
-    resolution: {integrity: sha512-hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg==}
-    engines: {node: '>=6'}
-    dependencies:
-      decode-uri-component: 0.2.2
-      filter-obj: 1.1.0
-      split-on-first: 1.1.0
-      strict-uri-encode: 2.0.0
-    dev: false
-
   /queue-microtask/1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
     dev: true
@@ -8022,7 +8112,7 @@ packages:
       react: 18.2.0
       scheduler: 0.23.0
 
-  /react-i18next/12.1.1_6vygckh2jgtx4nucc3no6lnm3y:
+  /react-i18next/12.1.1_25zoxyjt3sfdpelgxivbzvmrha:
     resolution: {integrity: sha512-mFdieOI0LDy84q3JuZU6Aou1DoWW2fhapcTGeBS8+vWSJuViuoCLQAMYSb0QoHhXS8B0WKUOPpx4cffAP7r/aA==}
     peerDependencies:
       i18next: '>= 19.0.0'
@@ -8037,7 +8127,7 @@ packages:
     dependencies:
       '@babel/runtime': 7.20.6
       html-parse-stringify: 3.0.1
-      i18next: 22.4.6
+      i18next: 22.4.8
       react: 18.2.0
       react-dom: 18.2.0_react@18.2.0
     dev: false
@@ -8440,6 +8530,14 @@ packages:
       lru-cache: 6.0.0
     dev: true
 
+  /semver/7.3.8:
+    resolution: {integrity: sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==}
+    engines: {node: '>=10'}
+    hasBin: true
+    dependencies:
+      lru-cache: 6.0.0
+    dev: true
+
   /set-value/2.0.1:
     resolution: {integrity: sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==}
     engines: {node: '>=0.10.0'}
@@ -8596,11 +8694,6 @@ packages:
     resolution: {integrity: sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==}
     dev: true
 
-  /split-on-first/1.1.0:
-    resolution: {integrity: sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==}
-    engines: {node: '>=6'}
-    dev: false
-
   /split-string/3.1.0:
     resolution: {integrity: sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==}
     engines: {node: '>=0.10.0'}
@@ -8633,11 +8726,6 @@ packages:
       object-copy: 0.1.0
     dev: true
 
-  /strict-uri-encode/2.0.0:
-    resolution: {integrity: sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==}
-    engines: {node: '>=4'}
-    dev: false
-
   /string-length/4.0.2:
     resolution: {integrity: sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==}
     engines: {node: '>=10'}
@@ -8901,7 +8989,7 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /ts-node/10.9.0_hylbnkdpdgf7fwrtnxxops6eba:
+  /ts-node/10.9.0_awa2wsr5thmg3i7jqycphctjfq:
     resolution: {integrity: sha512-bunW18GUyaCSYRev4DPf4SQpom3pWH29wKl0sDk5zE7ze19RImEVhCW7K4v3hHKkUyfWotU08ToE2RS+Y49aug==}
     hasBin: true
     peerDependencies:
@@ -8920,7 +9008,7 @@ packages:
       '@tsconfig/node12': 1.0.11
       '@tsconfig/node14': 1.0.3
       '@tsconfig/node16': 1.0.3
-      '@types/node': 14.18.26
+      '@types/node': 18.11.18
       acorn: 8.8.0
       acorn-walk: 8.2.0
       arg: 4.1.3
@@ -9085,11 +9173,8 @@ packages:
     engines: {node: '>= 10.0.0'}
     dev: true
 
-  /unload/2.3.1:
-    resolution: {integrity: sha512-MUZEiDqvAN9AIDRbbBnVYVvfcR6DrjCqeU2YQMmliFZl9uaBUjTkhuDQkBiyAy8ad5bx1TXVbqZ3gg7namsWjA==}
-    dependencies:
-      '@babel/runtime': 7.20.6
-      detect-node: 2.1.0
+  /unload/2.4.1:
+    resolution: {integrity: sha512-IViSAm8Z3sRBYA+9wc0fLQmU9Nrxb16rcDmIiR6Y9LJSZzI7QY5QsDhqPpKOjAn0O9/kfK1TfNEMMAGPTIraPw==}
     dev: false
 
   /unset-value/1.0.0:
@@ -9151,7 +9236,7 @@ packages:
       spdx-expression-parse: 3.0.1
     dev: true
 
-  /vite-plugin-eslint/1.8.1_eslint@8.30.0+vite@4.0.3:
+  /vite-plugin-eslint/1.8.1_eslint@8.31.0+vite@4.0.4:
     resolution: {integrity: sha512-PqdMf3Y2fLO9FsNPmMX+//2BF5SF8nEWspZdgl4kSt7UvHDRHVVfHvxsD7ULYzZrJDGRxR81Nq7TOFgwMnUang==}
     peerDependencies:
       eslint: '>=7'
@@ -9159,9 +9244,9 @@ packages:
     dependencies:
       '@rollup/pluginutils': 4.2.1
       '@types/eslint': 8.4.5
-      eslint: 8.30.0
+      eslint: 8.31.0
       rollup: 2.78.0
-      vite: 4.0.3_@types+node@18.11.18
+      vite: 4.0.4_@types+node@18.11.18
     dev: true
 
   /vite-plugin-istanbul/3.0.4:
@@ -9175,20 +9260,20 @@ packages:
       - supports-color
     dev: true
 
-  /vite-plugin-svgr/2.4.0_vite@4.0.3:
+  /vite-plugin-svgr/2.4.0_vite@4.0.4:
     resolution: {integrity: sha512-q+mJJol6ThvqkkJvvVFEndI4EaKIjSI0I3jNFgSoC9fXAz1M7kYTVUin8fhUsFojFDKZ9VHKtX6NXNaOLpbsHA==}
     peerDependencies:
       vite: ^2.6.0 || 3 || 4
     dependencies:
       '@rollup/pluginutils': 5.0.2
       '@svgr/core': 6.5.1
-      vite: 4.0.3_@types+node@18.11.18
+      vite: 4.0.4_@types+node@18.11.18
     transitivePeerDependencies:
       - rollup
       - supports-color
     dev: true
 
-  /vite-tsconfig-paths/4.0.3_p2fwcaxbionflq6hjivvbcsv5a:
+  /vite-tsconfig-paths/4.0.3_gl4qsmwzp7wy5uclz4tx77gbli:
     resolution: {integrity: sha512-gRO2Q/tOkV+9kMht5tz90+IaEKvW2zCnvwJV3tp2ruPNZOTM5rF+yXorJT4ggmAMYEaJ3nyXjx5P5jY5FwiZ+A==}
     peerDependencies:
       vite: '>2.0.0-0'
@@ -9196,14 +9281,14 @@ packages:
       debug: 4.3.4
       globrex: 0.1.2
       tsconfck: 2.0.1_typescript@4.9.4
-      vite: 4.0.3_@types+node@18.11.18
+      vite: 4.0.4_@types+node@18.11.18
     transitivePeerDependencies:
       - supports-color
       - typescript
     dev: true
 
-  /vite/4.0.3_@types+node@18.11.18:
-    resolution: {integrity: sha512-HvuNv1RdE7deIfQb8mPk51UKjqptO/4RXZ5yXSAvurd5xOckwS/gg8h9Tky3uSbnjYTgUm0hVCet1cyhKd73ZA==}
+  /vite/4.0.4_@types+node@18.11.18:
+    resolution: {integrity: sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
     peerDependencies:
@@ -9228,7 +9313,7 @@ packages:
         optional: true
     dependencies:
       '@types/node': 18.11.18
-      esbuild: 0.16.10
+      esbuild: 0.16.14
       postcss: 8.4.20
       resolve: 1.22.1
       rollup: 3.7.4
@@ -9383,6 +9468,10 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
+  /yallist/3.1.1:
+    resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
+    dev: true
+
   /yallist/4.0.0:
     resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
     dev: true
diff --git a/web/src/constants/SearchParams.ts b/web/src/constants/SearchParams.ts
index c23f1a2f6..bf5636151 100644
--- a/web/src/constants/SearchParams.ts
+++ b/web/src/constants/SearchParams.ts
@@ -1 +1,7 @@
-export const Identifier = "id";
+export const Identifier: string = "id";
+
+export const IdentityToken: string = "token";
+
+export const RedirectionURL: string = "rd";
+
+export const RequestMethod: string = "rm";
diff --git a/web/src/hooks/QueryParam.ts b/web/src/hooks/QueryParam.ts
new file mode 100644
index 000000000..758a142b9
--- /dev/null
+++ b/web/src/hooks/QueryParam.ts
@@ -0,0 +1,7 @@
+import { useSearchParams } from "react-router-dom";
+
+export function useQueryParam(queryParam: string) {
+    const [searchParams] = useSearchParams();
+    const value = searchParams.get(queryParam);
+    return value !== "" ? (value as string) : undefined;
+}
diff --git a/web/src/hooks/RedirectionURL.ts b/web/src/hooks/RedirectionURL.ts
deleted file mode 100644
index 9f5369ffa..000000000
--- a/web/src/hooks/RedirectionURL.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import queryString from "query-string";
-import { useLocation } from "react-router-dom";
-
-export function useRedirectionURL() {
-    const location = useLocation();
-
-    const queryParams = queryString.parse(location.search);
-
-    return queryParams && "rd" in queryParams ? (queryParams["rd"] as string) : undefined;
-}
diff --git a/web/src/hooks/RequestMethod.ts b/web/src/hooks/RequestMethod.ts
deleted file mode 100644
index 533b25d4c..000000000
--- a/web/src/hooks/RequestMethod.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import queryString from "query-string";
-import { useLocation } from "react-router-dom";
-
-export function useRequestMethod() {
-    const location = useLocation();
-    const queryParams = queryString.parse(location.search);
-    return queryParams && "rm" in queryParams ? (queryParams["rm"] as string) : undefined;
-}
diff --git a/web/src/utils/IdentityToken.ts b/web/src/utils/IdentityToken.ts
deleted file mode 100644
index 7e1960015..000000000
--- a/web/src/utils/IdentityToken.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import queryString from "query-string";
-
-export function extractIdentityToken(locationSearch: string) {
-    const queryParams = queryString.parse(locationSearch);
-    return queryParams && "token" in queryParams ? (queryParams["token"] as string) : null;
-}
diff --git a/web/src/views/DeviceRegistration/RegisterOneTimePassword.tsx b/web/src/views/DeviceRegistration/RegisterOneTimePassword.tsx
index 9940a5d5a..289fb9779 100644
--- a/web/src/views/DeviceRegistration/RegisterOneTimePassword.tsx
+++ b/web/src/views/DeviceRegistration/RegisterOneTimePassword.tsx
@@ -8,20 +8,20 @@ import makeStyles from "@mui/styles/makeStyles";
 import classnames from "classnames";
 import { QRCodeSVG } from "qrcode.react";
 import { useTranslation } from "react-i18next";
-import { useLocation, useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router-dom";
 
 import AppStoreBadges from "@components/AppStoreBadges";
 import { GoogleAuthenticator } from "@constants/constants";
 import { IndexRoute } from "@constants/Routes";
+import { IdentityToken } from "@constants/SearchParams";
 import { useNotifications } from "@hooks/NotificationsContext";
+import { useQueryParam } from "@hooks/QueryParam";
 import LoginLayout from "@layouts/LoginLayout";
 import { completeTOTPRegistrationProcess } from "@services/RegisterDevice";
-import { extractIdentityToken } from "@utils/IdentityToken";
 
 const RegisterOneTimePassword = function () {
     const styles = useStyles();
     const navigate = useNavigate();
-    const location = useLocation();
     // The secret retrieved from the API is all is ok.
     const [secretURL, setSecretURL] = useState("empty");
     const [secretBase32, setSecretBase32] = useState(undefined as string | undefined);
@@ -32,7 +32,7 @@ const RegisterOneTimePassword = function () {
 
     // Get the token from the query param to give it back to the API when requesting
     // the secret for OTP.
-    const processToken = extractIdentityToken(location.search);
+    const processToken = useQueryParam(IdentityToken);
 
     const handleDoneClick = () => {
         navigate(IndexRoute);
diff --git a/web/src/views/DeviceRegistration/RegisterWebauthn.tsx b/web/src/views/DeviceRegistration/RegisterWebauthn.tsx
index b4ebcb25c..f16957806 100644
--- a/web/src/views/DeviceRegistration/RegisterWebauthn.tsx
+++ b/web/src/views/DeviceRegistration/RegisterWebauthn.tsx
@@ -10,7 +10,9 @@ import InformationIcon from "@components/InformationIcon";
 import SuccessIcon from "@components/SuccessIcon";
 import WebauthnTryIcon from "@components/WebauthnTryIcon";
 import { SettingsRoute, SettingsTwoFactorAuthenticationSubRoute } from "@constants/Routes";
+import { IdentityToken } from "@constants/SearchParams";
 import { useNotifications } from "@hooks/NotificationsContext";
+import { useQueryParam } from "@hooks/QueryParam";
 import LoginLayout from "@layouts/LoginLayout";
 import { AttestationPublicKeyCredential, AttestationResult, WebauthnTouchState } from "@models/Webauthn";
 import {
@@ -18,7 +20,6 @@ import {
     getAttestationCreationOptions,
     getAttestationPublicKeyCredentialResult,
 } from "@services/Webauthn";
-import { extractIdentityToken } from "@utils/IdentityToken";
 
 const steps = ["Confirm device", "Choose name"];
 
@@ -39,7 +40,7 @@ const RegisterWebauthn = function (props: Props) {
     const nameRef = useRef() as MutableRefObject<HTMLInputElement>;
     const [nameError, setNameError] = useState(false);
 
-    const processToken = extractIdentityToken(location.search);
+    const processToken = useQueryParam(IdentityToken);
 
     const handleBackClick = () => {
         navigate(`${SettingsRoute}${SettingsTwoFactorAuthenticationSubRoute}`);
diff --git a/web/src/views/LoginPortal/FirstFactor/FirstFactorForm.tsx b/web/src/views/LoginPortal/FirstFactor/FirstFactorForm.tsx
index f6ed2a055..54befc76c 100644
--- a/web/src/views/LoginPortal/FirstFactor/FirstFactorForm.tsx
+++ b/web/src/views/LoginPortal/FirstFactor/FirstFactorForm.tsx
@@ -9,9 +9,9 @@ import { useNavigate } from "react-router-dom";
 
 import FixedTextField from "@components/FixedTextField";
 import { ResetPasswordStep1Route } from "@constants/Routes";
+import { RedirectionURL, RequestMethod } from "@constants/SearchParams";
 import { useNotifications } from "@hooks/NotificationsContext";
-import { useRedirectionURL } from "@hooks/RedirectionURL";
-import { useRequestMethod } from "@hooks/RequestMethod";
+import { useQueryParam } from "@hooks/QueryParam";
 import { useWorkflow } from "@hooks/Workflow";
 import LoginLayout from "@layouts/LoginLayout";
 import { postFirstFactor } from "@services/FirstFactor";
@@ -32,8 +32,8 @@ export interface Props {
 const FirstFactorForm = function (props: Props) {
     const styles = useStyles();
     const navigate = useNavigate();
-    const redirectionURL = useRedirectionURL();
-    const requestMethod = useRequestMethod();
+    const redirectionURL = useQueryParam(RedirectionURL);
+    const requestMethod = useQueryParam(RequestMethod);
     const [workflow] = useWorkflow();
 
     const loginChannel = useMemo(() => new BroadcastChannel<boolean>("login"), []);
diff --git a/web/src/views/LoginPortal/LoginPortal.tsx b/web/src/views/LoginPortal/LoginPortal.tsx
index 0a63194e7..ff5d1e3cf 100644
--- a/web/src/views/LoginPortal/LoginPortal.tsx
+++ b/web/src/views/LoginPortal/LoginPortal.tsx
@@ -10,9 +10,10 @@ import {
     SecondFactorTOTPSubRoute,
     SecondFactorWebauthnSubRoute,
 } from "@constants/Routes";
+import { RedirectionURL } from "@constants/SearchParams";
 import { useConfiguration } from "@hooks/Configuration";
 import { useNotifications } from "@hooks/NotificationsContext";
-import { useRedirectionURL } from "@hooks/RedirectionURL";
+import { useQueryParam } from "@hooks/QueryParam";
 import { useRedirector } from "@hooks/Redirector";
 import { useRouterNavigate } from "@hooks/RouterNavigate";
 import { useAutheliaState } from "@hooks/State";
@@ -38,7 +39,7 @@ const RedirectionErrorMessage =
 
 const LoginPortal = function (props: Props) {
     const location = useLocation();
-    const redirectionURL = useRedirectionURL();
+    const redirectionURL = useQueryParam(RedirectionURL);
     const { createErrorNotification } = useNotifications();
     const [firstFactorDisabled, setFirstFactorDisabled] = useState(true);
     const [broadcastRedirect, setBroadcastRedirect] = useState(false);
diff --git a/web/src/views/LoginPortal/SecondFactor/OTPDial.tsx b/web/src/views/LoginPortal/SecondFactor/OTPDial.tsx
index b05660a46..5de55beab 100644
--- a/web/src/views/LoginPortal/SecondFactor/OTPDial.tsx
+++ b/web/src/views/LoginPortal/SecondFactor/OTPDial.tsx
@@ -34,6 +34,7 @@ const OTPDial = function (props: Props) {
                     isDisabled={props.state === State.InProgress || props.state === State.Success}
                     isInputNum
                     hasErrored={props.state === State.Failure}
+                    autoComplete="one-time-code"
                     inputStyle={classnames(
                         styles.otpDigitInput,
                         props.state === State.Failure ? styles.inputError : "",
diff --git a/web/src/views/LoginPortal/SecondFactor/OneTimePasswordMethod.tsx b/web/src/views/LoginPortal/SecondFactor/OneTimePasswordMethod.tsx
index 5cd60d08f..268b2115f 100644
--- a/web/src/views/LoginPortal/SecondFactor/OneTimePasswordMethod.tsx
+++ b/web/src/views/LoginPortal/SecondFactor/OneTimePasswordMethod.tsx
@@ -2,7 +2,8 @@ import React, { useCallback, useEffect, useRef, useState } from "react";
 
 import { useTranslation } from "react-i18next";
 
-import { useRedirectionURL } from "@hooks/RedirectionURL";
+import { RedirectionURL } from "@constants/SearchParams";
+import { useQueryParam } from "@hooks/QueryParam";
 import { useUserInfoTOTPConfiguration } from "@hooks/UserInfoTOTPConfiguration";
 import { useWorkflow } from "@hooks/Workflow";
 import { completeTOTPSignIn } from "@services/OneTimePassword";
@@ -33,7 +34,7 @@ const OneTimePasswordMethod = function (props: Props) {
     const [state, setState] = useState(
         props.authenticationLevel === AuthenticationLevel.TwoFactor ? State.Success : State.Idle,
     );
-    const redirectionURL = useRedirectionURL();
+    const redirectionURL = useQueryParam(RedirectionURL);
     const [workflow, workflowID] = useWorkflow();
     const { t: translate } = useTranslation();
 
diff --git a/web/src/views/LoginPortal/SecondFactor/PushNotificationMethod.tsx b/web/src/views/LoginPortal/SecondFactor/PushNotificationMethod.tsx
index ea4b93890..6c37077fa 100644
--- a/web/src/views/LoginPortal/SecondFactor/PushNotificationMethod.tsx
+++ b/web/src/views/LoginPortal/SecondFactor/PushNotificationMethod.tsx
@@ -6,8 +6,9 @@ import makeStyles from "@mui/styles/makeStyles";
 import FailureIcon from "@components/FailureIcon";
 import PushNotificationIcon from "@components/PushNotificationIcon";
 import SuccessIcon from "@components/SuccessIcon";
+import { RedirectionURL } from "@constants/SearchParams";
 import { useIsMountedRef } from "@hooks/Mounted";
-import { useRedirectionURL } from "@hooks/RedirectionURL";
+import { useQueryParam } from "@hooks/QueryParam";
 import { useWorkflow } from "@hooks/Workflow";
 import {
     DuoDevicePostRequest,
@@ -44,7 +45,7 @@ export interface Props {
 const PushNotificationMethod = function (props: Props) {
     const styles = useStyles();
     const [state, setState] = useState(State.SignInInProgress);
-    const redirectionURL = useRedirectionURL();
+    const redirectionURL = useQueryParam(RedirectionURL);
     const [workflow, workflowID] = useWorkflow();
     const mounted = useIsMountedRef();
     const [enroll_url, setEnrollUrl] = useState("");
diff --git a/web/src/views/LoginPortal/SecondFactor/WebauthnMethod.tsx b/web/src/views/LoginPortal/SecondFactor/WebauthnMethod.tsx
index 023eea4bd..b761f330f 100644
--- a/web/src/views/LoginPortal/SecondFactor/WebauthnMethod.tsx
+++ b/web/src/views/LoginPortal/SecondFactor/WebauthnMethod.tsx
@@ -1,8 +1,9 @@
 import React, { useCallback, useEffect, useRef, useState } from "react";
 
 import WebauthnTryIcon from "@components/WebauthnTryIcon";
+import { RedirectionURL } from "@constants/SearchParams";
 import { useIsMountedRef } from "@hooks/Mounted";
-import { useRedirectionURL } from "@hooks/RedirectionURL";
+import { useQueryParam } from "@hooks/QueryParam";
 import { useWorkflow } from "@hooks/Workflow";
 import { AssertionResult, WebauthnTouchState } from "@models/Webauthn";
 import { AuthenticationLevel } from "@services/State";
@@ -25,7 +26,7 @@ export interface Props {
 
 const WebauthnMethod = function (props: Props) {
     const [state, setState] = useState(WebauthnTouchState.WaitTouch);
-    const redirectionURL = useRedirectionURL();
+    const redirectionURL = useQueryParam(RedirectionURL);
     const [workflow, workflowID] = useWorkflow();
     const mounted = useIsMountedRef();
 
diff --git a/web/src/views/LoginPortal/SignOut/SignOut.tsx b/web/src/views/LoginPortal/SignOut/SignOut.tsx
index 204b69a7e..917471f5d 100644
--- a/web/src/views/LoginPortal/SignOut/SignOut.tsx
+++ b/web/src/views/LoginPortal/SignOut/SignOut.tsx
@@ -6,9 +6,10 @@ import { useTranslation } from "react-i18next";
 import { Navigate } from "react-router-dom";
 
 import { IndexRoute } from "@constants/Routes";
+import { RedirectionURL } from "@constants/SearchParams";
 import { useIsMountedRef } from "@hooks/Mounted";
 import { useNotifications } from "@hooks/NotificationsContext";
-import { useRedirectionURL } from "@hooks/RedirectionURL";
+import { useQueryParam } from "@hooks/QueryParam";
 import { useRedirector } from "@hooks/Redirector";
 import LoginLayout from "@layouts/LoginLayout";
 import { signOut } from "@services/SignOut";
@@ -19,7 +20,7 @@ const SignOut = function (props: Props) {
     const mounted = useIsMountedRef();
     const styles = useStyles();
     const { createErrorNotification } = useNotifications();
-    const redirectionURL = useRedirectionURL();
+    const redirectionURL = useQueryParam(RedirectionURL);
     const redirector = useRedirector();
     const [timedOut, setTimedOut] = useState(false);
     const [safeRedirect, setSafeRedirect] = useState(false);
diff --git a/web/src/views/ResetPassword/ResetPasswordStep2.tsx b/web/src/views/ResetPassword/ResetPasswordStep2.tsx
index 0319c502a..ce3669c98 100644
--- a/web/src/views/ResetPassword/ResetPasswordStep2.tsx
+++ b/web/src/views/ResetPassword/ResetPasswordStep2.tsx
@@ -5,21 +5,21 @@ import { Button, Grid, IconButton, InputAdornment, Theme } from "@mui/material";
 import makeStyles from "@mui/styles/makeStyles";
 import classnames from "classnames";
 import { useTranslation } from "react-i18next";
-import { useLocation, useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router-dom";
 
 import FixedTextField from "@components/FixedTextField";
 import PasswordMeter from "@components/PasswordMeter";
 import { IndexRoute } from "@constants/Routes";
+import { IdentityToken } from "@constants/SearchParams";
 import { useNotifications } from "@hooks/NotificationsContext";
+import { useQueryParam } from "@hooks/QueryParam";
 import LoginLayout from "@layouts/LoginLayout";
 import { PasswordPolicyConfiguration, PasswordPolicyMode } from "@models/PasswordPolicy";
 import { getPasswordPolicyConfiguration } from "@services/PasswordPolicyConfiguration";
 import { completeResetPasswordProcess, resetPassword } from "@services/ResetPassword";
-import { extractIdentityToken } from "@utils/IdentityToken";
 
 const ResetPasswordStep2 = function () {
     const styles = useStyles();
-    const location = useLocation();
     const [formDisabled, setFormDisabled] = useState(true);
     const [password1, setPassword1] = useState("");
     const [password2, setPassword2] = useState("");
@@ -43,7 +43,7 @@ const ResetPasswordStep2 = function () {
 
     // Get the token from the query param to give it back to the API when requesting
     // the secret for OTP.
-    const processToken = extractIdentityToken(location.search);
+    const processToken = useQueryParam(IdentityToken);
 
     const completeProcess = useCallback(async () => {
         if (!processToken) {